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

Proposed by Omer Akram
Status: Needs review
Proposed branch: lp:~om26er/ubuntu/maverick/nautilus/nautilus-fix-683972
Merge into: lp:ubuntu/maverick-proposed/nautilus
Diff against target: 61 lines (+40/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/97_unmount_crash_2.patch (+32/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~om26er/ubuntu/maverick/nautilus/nautilus-fix-683972
Reviewer Review Type Date Requested Status
Jamie Strandboge Approve
Review via email: mp+45849@code.launchpad.net

Description of the change

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

To post a comment you must log in.
205. By Omer Akram

added Dep3 tags to the patch.

Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Thanks!

review: Approve

Unmerged revisions

205. By Omer Akram

added Dep3 tags to the patch.

204. By Omer Akram

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-05 11:09:49 +0000
3+++ debian/changelog 2011-01-11 13:14:28 +0000
4@@ -1,3 +1,10 @@
5+nautilus (1:2.32.0-0ubuntu1.2) maverick-proposed; urgency=low
6+
7+ * debian/patches/97_unmount_crash_2.patch:
8+ - Don't crash when unmounting usb devices. (LP: #683972)
9+
10+ -- Omer Akram <om26er@ubuntu.com> Tue, 11 Jan 2011 17:56:31 +0500
11+
12 nautilus (1:2.32.0-0ubuntu1.1) maverick-proposed; urgency=low
13
14 * debian/patches/96_git_unmount_crash.patch: backport an upstream commit
15
16=== added file 'debian/patches/97_unmount_crash_2.patch'
17--- debian/patches/97_unmount_crash_2.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/97_unmount_crash_2.patch 2011-01-11 13:14:28 +0000
19@@ -0,0 +1,32 @@
20+From: Omer Akram <om26er@ubuntu.com>
21+Author: Cosimo Cecchi <cosimoc@gnome.org>
22+Subject: Pathbar: remove buttons only if the gone file is below the current.
23+Origin: http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=c3b54e662b52ca15d1dcbe68386b8fa82b12adc5
24+Bug: https://bugs.gnome.org/627901
25+Bug-Ubuntu: https://launchpad.net/bugs/683972
26+
27+--- a/src/nautilus-pathbar.c
28++++ b/src/nautilus-pathbar.c
29+@@ -1571,10 +1571,12 @@ button_data_file_changed (NautilusFile *file,
30+ } else if (nautilus_file_is_gone (file)) {
31+ gint idx, position;
32+
33+- /* if the current location is gone, don't do anything, as the view
34++ /* if the current or a parent location are gone, don't do anything, as the view
35+ * will get the event too and call us back.
36+ */
37+- if (nautilus_file_compare_location (file, current_button_data->file) != 0) {
38++ current_location = nautilus_file_get_location (current_button_data->file);
39++
40++ if (g_file_has_prefix (location, current_location)) {
41+ /* remove this and the following buttons */
42+ position = g_list_position (path_bar->button_list,
43+ g_list_find (path_bar->button_list, button_data));
44+@@ -1587,6 +1589,7 @@ button_data_file_changed (NautilusFile *file,
45+ }
46+ }
47+
48++ g_object_unref (current_location);
49+ g_object_unref (location);
50+ return;
51+ }
52
53=== modified file 'debian/patches/series'
54--- debian/patches/series 2010-11-05 11:09:49 +0000
55+++ debian/patches/series 2011-01-11 13:14:28 +0000
56@@ -13,5 +13,6 @@
57 #91_correct_rgba_use.patch
58 95_no-initial-fade.patch
59 96_git_unmount_crash.patch
60+97_unmount_crash_2.patch
61 99_ltmain_as-needed.patch
62

Subscribers

People subscribed via source and target branches

to all changes: