File nautilus-bgo711115-format-item-for-volumes-disa... of Package nautilus

Overview Repositories Revisions Requests Users Attributes Meta

File nautilus-bgo711115-format-item-for-volumes-disappeared.patch of Package nautilus

From 96904b32e021cb88594226ca5f9c0569fba9ffe7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 29 Oct 2013 22:43:54 -0400
Subject: [PATCH] Format item for volumes disappeared

Trying to reproduce some problem with the Format... menuitem
on usb sticks in the sidebar, I found that the menuitem is gone
in 3.10 - it turns out GtkPlacesSidebar gives both a selected_item
and a selected_volume in some cases, therefore the conditions
need to be checked in two independent ifs instead of the current
if ... else if ...

https://bugzilla.gnome.org/show_bug.cgi?id=711115
---
 src/nautilus-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 9031360..8e24f4f 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -823,7 +823,8 @@ places_sidebar_populate_popup_cb (GtkPlacesSidebar *sidebar,
 			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 			gtk_widget_show (item);
 		}
-	} else if (selected_volume) {
+	}
+	if (selected_volume) {
 		if (should_show_format_command (selected_volume)) {
 			item = gtk_menu_item_new_with_mnemonic (_("_Format…"));
 			g_object_set_data_full (G_OBJECT (item), "nautilus-volume",
-- 
1.8.4