Merge lp:~om26er/ubuntu/maverick/nautilus/nautilus-fix-683972 into lp:ubuntu/maverick-proposed/nautilus

[Omer Akram]

it seems the fix for 'crash when unmounting' issue required two upstream commits. now backported the second.

[lp:~om26er/ubuntu/maverick/nautilus/nautilus-fix-683972]

205. By Omer Akram on 2011-01-11

added Dep3 tags to the patch.

[Jamie Strandboge (jdstrand)]

Thanks!

review: Approve

Unmerged revisions

205. By Omer Akram on 2011-01-11

added Dep3 tags to the patch.

204. By Omer Akram on 2011-01-11

* debian/patches/97_unmount_crash_2.patch:
  - Don't crash when unmounting usb devices. (LP: #683972)

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-05 11:09:49 +0000
+++ debian/changelog	2011-01-11 13:14:28 +0000
@@ -1,3 +1,10 @@
+nautilus (1:2.32.0-0ubuntu1.2) maverick-proposed; urgency=low
+
+  * debian/patches/97_unmount_crash_2.patch:
+    - Don't crash when unmounting usb devices. (LP: #683972)
+
+ -- Omer Akram <[e-mail]>  Tue, 11 Jan 2011 17:56:31 +0500
+
 nautilus (1:2.32.0-0ubuntu1.1) maverick-proposed; urgency=low
 
   * debian/patches/96_git_unmount_crash.patch: backport an upstream commit
 
=== added file 'debian/patches/97_unmount_crash_2.patch'
--- debian/patches/97_unmount_crash_2.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/97_unmount_crash_2.patch	2011-01-11 13:14:28 +0000
@@ -0,0 +1,32 @@
+From: Omer Akram <[e-mail]>
+Author: Cosimo Cecchi <[e-mail]>
+Subject: Pathbar: remove buttons only if the gone file is below the current.
+Origin: http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=c3b54e662b52ca15d1dcbe68386b8fa82b12adc5
+Bug: https://bugs.gnome.org/627901
+Bug-Ubuntu: https://launchpad.net/bugs/683972
+
+--- a/src/nautilus-pathbar.c
++++ b/src/nautilus-pathbar.c
+@@ -1571,10 +1571,12 @@ button_data_file_changed (NautilusFile *file,
+ 	} else if (nautilus_file_is_gone (file)) {
+ 		gint idx, position;
+ 
+-		/* if the current location is gone, don't do anything, as the view
++		/* if the current or a parent location are gone, don't do anything, as the view
+ 		 * will get the event too and call us back.
+ 		 */
+-		if (nautilus_file_compare_location (file, current_button_data->file) != 0) {
++		current_location = nautilus_file_get_location (current_button_data->file);
++
++		if (g_file_has_prefix (location, current_location)) {
+ 			/* remove this and the following buttons */
+ 			position = g_list_position (path_bar->button_list,
+ 						    g_list_find (path_bar->button_list, button_data));
+@@ -1587,6 +1589,7 @@ button_data_file_changed (NautilusFile *file,
+ 			}
+ 		}
+ 
++		g_object_unref (current_location);
+ 		g_object_unref (location);
+ 		return;
+ 	}
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-05 11:09:49 +0000
+++ debian/patches/series	2011-01-11 13:14:28 +0000
@@ -13,5 +13,6 @@
 #91_correct_rgba_use.patch
 95_no-initial-fade.patch
 96_git_unmount_crash.patch
+97_unmount_crash_2.patch
 99_ltmain_as-needed.patch