rpms/nautilus/F-12 nautilus-2.28.2-infopanel-selection-crash.patch, NONE, 1.1 nautilus.spec, 1.291, 1.292

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/nautilus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1731

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.28.2-infopanel-selection-crash.patch 
Log Message:
* Mon Nov  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-2
- Don't crash in infopanel on invalid selection (#531826)


nautilus-2.28.2-infopanel-selection-crash.patch:
 nautilus-information-panel.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE nautilus-2.28.2-infopanel-selection-crash.patch ---
>From b10717e1634128f08009c11f0a570888ee314350 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Mon, 2 Nov 2009 17:10:47 +0100
Subject: [PATCH] Fall back to display parent folder info when selection is invalid

See bug 590591.
---
 src/nautilus-information-panel.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index ce162ef..03e398b 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -1114,15 +1114,20 @@ selection_changed_callback (NautilusWindowInfo *window,
 	selection = nautilus_window_info_get_selection (window);
 	selection_count = g_list_length (selection);
 
+	file = NULL;
+
 	if (selection_count == 1) {
 		selection = nautilus_window_info_get_selection (window);
 		selected = selection->data;
 
-		/* this should never fail here, as we're displaying the file */
+		/* FIXME: in some cases we're unable to get a NautilusFile
+		          for the selected file. See bug 590591 for details. */
 		file = nautilus_file_get_existing (selected);
+	}
+
+	if (file) {
 		uri = nautilus_file_get_uri (file);
 		name = nautilus_file_get_display_name (file);
-
 		nautilus_file_unref (file);
 	} else {
 		uri = nautilus_window_info_get_current_location (window);
-- 
1.6.5.1



Index: nautilus.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus/F-12/nautilus.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -p -r1.291 -r1.292
--- nautilus.spec	21 Oct 2009 13:56:13 -0000	1.291
+++ nautilus.spec	2 Nov 2009 16:28:52 -0000	1.292
@@ -15,7 +15,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.28.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
@@ -90,6 +90,12 @@ Patch17:	nautilus-filetype-symlink-fix.p
 # Need to file upstream and investigate a real fix
 Patch18:	nautilus-2.28.0-revert-bg-fade-break.patch
 
+# nautilus crashed with SIGSEGV in nautilus_file_peek_display_name()
+# https://bugzilla.gnome.org/show_bug.cgi?id=590591
+# https://bugzilla.redhat.com/show_bug.cgi?id=531826
+# TODO: push upstream once confirmed as fixed
+Patch19:	nautilus-2.28.2-infopanel-selection-crash.patch
+
 
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
@@ -129,6 +135,7 @@ for developing nautilus extensions.
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
 %patch18 -p1 -b .revert-bg-fade-break
+%patch19 -p1 -b .infopanel-crash
 
 %build
 
@@ -264,6 +271,9 @@ fi
 
 
 %changelog
+* Mon Nov  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-2
+- Don't crash in infopanel on invalid selection (#531826)
+
 * Wed Oct 21 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
 - Update to 2.28.1