Merge lp:~mitya57/nautilus/ubuntu-fix-lp-795708 into lp:~ubuntu-desktop/nautilus/ubuntu

[Dmitry Shachnev]

This branch contains ported patch from https://bugzilla.gnome.org/show_bug.cgi?id=652320.
This patch fixes the crash for me.

Now that patch is in Git, so you can add a "git_" prefix if you want.

[Martin Pitt (pitti)]

Thanks! I'll also upload this as SRU.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-02 14:58:13 +0000
+++ debian/changelog	2011-12-03 14:51:59 +0000
@@ -1,3 +1,11 @@
+nautilus (1:3.2.1-0ubuntu6) precise; urgency=low
+
+  * debian/patches/18_fix_crash_in_get_current_uri.patch:
+    - Upstream patch to fix crash in nautilus_window_slot_get_current_uri()
+      (LP: #795708)
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 02 Dec 2011 20:37:11 +0400
+
 nautilus (1:3.2.1-0ubuntu5) precise; urgency=low
 
   [ Didier Roche ]

=== added file 'debian/patches/18_fix_crash_in_get_current_uri.patch'
--- debian/patches/18_fix_crash_in_get_current_uri.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/18_fix_crash_in_get_current_uri.patch	2011-12-03 14:51:59 +0000
@@ -0,0 +1,33 @@
+Description: Fix crash in nautilus_window_slot_get_current_uri()
+Author: Cosimo Cecchi <[e-mail]>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=652320
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/795708
+
+Index: ubuntu/src/nautilus-window.c
+===================================================================
+--- ubuntu.orig/src/nautilus-window.c	2011-12-02 20:37:06.156934437 +0400
++++ ubuntu/src/nautilus-window.c	2011-12-02 20:36:28.325575521 +0400
+@@ -474,8 +474,10 @@
+ {
+ 	DEBUG ("Destroying sidebar");
+ 
+-	gtk_widget_destroy (GTK_WIDGET (window->details->sidebar));
+-	window->details->sidebar = NULL;
++	if (window->details->sidebar != NULL) {
++		gtk_widget_destroy (GTK_WIDGET (window->details->sidebar));
++		window->details->sidebar = NULL;
++	}
+ }
+ 
+ void
+@@ -721,8 +723,8 @@
+ 
+ 	DEBUG ("Destroying window");
+ 
+-	window->details->content_paned = NULL;
+-	window->details->split_view_hpane = NULL;
++	/* close the sidebar first */
++	nautilus_window_tear_down_sidebar (window);
+ 
+ 	/* close all panes safely */
+ 	panes_copy = g_list_copy (window->details->panes);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-02 14:52:42 +0000
+++ debian/patches/series	2011-12-03 14:51:59 +0000
@@ -14,6 +14,7 @@
 15_use-ubuntu-help.patch
 16_run_in_gnome_unity.patch
 17_dont_allow_new_tab_on_desktop.patch
+18_fix_crash_in_get_current_uri.patch
 git-0001-Workaround-focus-issues-on-typeahead.patch
 git_sideplace_sorting.patch