--- a/ChangeLog	Tue Jul 26 06:38:29 2011 +0000
+++ b/ChangeLog	Tue Jul 26 07:05:26 2011 +0000
@@ -1,3 +1,9 @@
+2011-07-26  Padraig O'Briain  <[email protected]>
+
+	* patches/nautilus-15-search-crash.diff: Remove as no longer needed.
+	* patches/nautilus-16-rename-places.diff
+	* base-specs/nautilus.spec: Updated patch to apply to 3.1.3.
+ 
 2011-07-26  Brian Cameron  <[email protected]>
 
 	* specs/SUNWdesktop-cache.spec: Update to 0.2.6 to fix CR #7065973.
@@ -18,7 +24,7 @@
 2011-07-25  Padraig O'Briain  <[email protected]>
 
 	* patches/nautilus-14-zfs-snapshot.diff,
-	* base-specs/nautilus.spec: Updated patch to appliy to 3.1.3.
+	* base-specs/nautilus.spec: Updated patch to apply to 3.1.3.
 
 2011-07-22  Brian Cameron  <[email protected]>
 

--- a/base-specs/nautilus.spec	Tue Jul 26 06:38:29 2011 +0000
+++ b/base-specs/nautilus.spec	Tue Jul 26 07:05:26 2011 +0000
@@ -57,8 +57,6 @@
 Patch13:      nautilus-13-interface-changes.diff
 #owner:erwannc date:2008-08-28 type:feature bugster:6738643
 Patch14:       nautilus-14-zfs-snapshot.diff
-#owner:padraig date:2010-12-07 type:bug doo:16036
-Patch15:       nautilus-15-search-crash.diff
 #owner:padraig date:2011-02-08 type:bug feature:7017527 bugzilla:641740
 Patch16:       nautilus-16-rename-places.diff
 #owner:migi    date:2011-02-14 type:bug doo:14557
@@ -154,8 +152,7 @@
 %patch11 -p1
 %patch13 -p1
 %patch14 -p1
-#%patch15 -p1
-#%patch16 -p1
+%patch16 -p1
 #%patch17 -p1
 #%patch18 -p1
 #%patch19 -p1
@@ -261,6 +258,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jul 26 2011 - [email protected]
+- Remove patch nautilus-15-search-crash.diff as no longer required.
 * Thu Jul 07 2011 - [email protected]
 - Bump to 3.1.3.
 * Mon Feb 28 2011 - [email protected]
@@ -269,7 +268,7 @@
 - nautilus-16-background-fade.diff: patch written by BrianC to allow control
   in the gconf fading effect for the background.
 * Tue Feb 08 2011 - [email protected]
-- Add patchf ro CR 79017527
+- Add patch for CR 79017527
 * Tue Jan 12 2011 - [email protected]
 - nautilus-07-lockdown.diff: reworked. The lockdown mode will
   not apply to the Primary Administrator, System Administrator, 

--- a/patches/nautilus-15-search-crash.diff	Tue Jul 26 06:38:29 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- nautilus-2.30.1/libnautilus-private/nautilus-search-engine-tracker.c.orig	2010-04-12 11:43:44.000000000 +0100
-+++ nautilus-2.30.1/libnautilus-private/nautilus-search-engine-tracker.c	2010-12-07 10:57:33.316942852 +0000
-@@ -99,7 +99,9 @@
- 	MAP (tracker_get_version, TRACKER_0_6),
- 	MAP (tracker_cancel_last_call, TRACKER_0_6 | TRACKER_0_7 | TRACKER_0_8),
- 	MAP (tracker_search_metadata_by_text_async, TRACKER_0_6 | TRACKER_0_7),
-+	MAP (tracker_search_metadata_by_text_and_mime_async, TRACKER_0_6 | TRACKER_0_7),
- 	MAP (tracker_search_metadata_by_text_and_location_async, TRACKER_0_6 | TRACKER_0_7),
-+	MAP (tracker_search_metadata_by_text_and_mime_and_location_async, TRACKER_0_6 | TRACKER_0_7),
- 	MAP (tracker_client_new, TRACKER_0_8),
- 	MAP (tracker_sparql_escape, TRACKER_0_8),
- 	MAP (tracker_resources_sparql_query_async, TRACKER_0_8)

--- a/patches/nautilus-16-rename-places.diff	Tue Jul 26 06:38:29 2011 +0000
+++ b/patches/nautilus-16-rename-places.diff	Tue Jul 26 07:05:26 2011 +0000
@@ -1,6 +1,6 @@
---- nautilus-2.30.1/src/nautilus-places-sidebar.c.orig	2011-02-08 12:27:38.431112473 +0000
-+++ nautilus-2.30.1/src/nautilus-places-sidebar.c	2011-02-08 12:28:52.183711672 +0000
-@@ -2399,6 +2399,7 @@
+--- nautilus-3.1.3/src/nautilus-places-sidebar.c.orig	2011-07-25 16:08:45.092892658 +0100
++++ nautilus-3.1.3/src/nautilus-places-sidebar.c	2011-07-25 16:13:21.205043502 +0100
+@@ -2938,6 +2938,7 @@
  	GtkTreeIter iter;
  	NautilusBookmark *bookmark;
  	int index;
@@ -8,15 +8,15 @@
  
  	g_object_set (cell, "editable", FALSE, NULL);
  	
-@@ -2407,6 +2408,11 @@
- 	gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store), &iter,
+@@ -2946,6 +2947,11 @@
+ 	gtk_tree_model_get (GTK_TREE_MODEL (sidebar->filter_model), &iter,
  		            PLACES_SIDEBAR_COLUMN_INDEX, &index,
  		            -1);
 +	g_value_init (&a, G_TYPE_STRING);
 +	g_value_set_static_string (&a, new_text);
-+	gtk_list_store_set_value (sidebar->store, &iter,
++	gtk_list_store_set_value (sidebar->filter_model, &iter,
 +				  PLACES_SIDEBAR_COLUMN_NAME, &a);
-+	g_value_unset(&a); 
++	g_value_unset(&a);
  	gtk_tree_path_free (path);
  	bookmark = nautilus_bookmark_list_item_at (sidebar->bookmarks, index);