Tomas Bzatek cae98f9
From b10717e1634128f08009c11f0a570888ee314350 Mon Sep 17 00:00:00 2001
Tomas Bzatek cae98f9
From: Tomas Bzatek <tbzatek@redhat.com>
Tomas Bzatek cae98f9
Date: Mon, 2 Nov 2009 17:10:47 +0100
Tomas Bzatek cae98f9
Subject: [PATCH] Fall back to display parent folder info when selection is invalid
Tomas Bzatek cae98f9
Tomas Bzatek cae98f9
See bug 590591.
Tomas Bzatek cae98f9
---
Tomas Bzatek cae98f9
 src/nautilus-information-panel.c |    9 +++++++--
Tomas Bzatek cae98f9
 1 files changed, 7 insertions(+), 2 deletions(-)
Tomas Bzatek cae98f9
Tomas Bzatek cae98f9
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
Tomas Bzatek cae98f9
index ce162ef..03e398b 100644
Tomas Bzatek cae98f9
--- a/src/nautilus-information-panel.c
Tomas Bzatek cae98f9
+++ b/src/nautilus-information-panel.c
Tomas Bzatek cae98f9
@@ -1114,15 +1114,20 @@ selection_changed_callback (NautilusWindowInfo *window,
Tomas Bzatek cae98f9
 	selection = nautilus_window_info_get_selection (window);
Tomas Bzatek cae98f9
 	selection_count = g_list_length (selection);
Tomas Bzatek cae98f9
 
Tomas Bzatek cae98f9
+	file = NULL;
Tomas Bzatek cae98f9
+
Tomas Bzatek cae98f9
 	if (selection_count == 1) {
Tomas Bzatek cae98f9
 		selection = nautilus_window_info_get_selection (window);
Tomas Bzatek cae98f9
 		selected = selection->data;
Tomas Bzatek cae98f9
 
Tomas Bzatek cae98f9
-		/* this should never fail here, as we're displaying the file */
Tomas Bzatek cae98f9
+		/* FIXME: in some cases we're unable to get a NautilusFile
Tomas Bzatek cae98f9
+		          for the selected file. See bug 590591 for details. */
Tomas Bzatek cae98f9
 		file = nautilus_file_get_existing (selected);
Tomas Bzatek cae98f9
+	}
Tomas Bzatek cae98f9
+
Tomas Bzatek cae98f9
+	if (file) {
Tomas Bzatek cae98f9
 		uri = nautilus_file_get_uri (file);
Tomas Bzatek cae98f9
 		name = nautilus_file_get_display_name (file);
Tomas Bzatek cae98f9
-
Tomas Bzatek cae98f9
 		nautilus_file_unref (file);
Tomas Bzatek cae98f9
 	} else {
Tomas Bzatek cae98f9
 		uri = nautilus_window_info_get_current_location (window);
Tomas Bzatek cae98f9
-- 
Tomas Bzatek cae98f9
1.6.5.1
Tomas Bzatek cae98f9