nautilus r14157 - in branches/gnome-2-22: . src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Tue May 13 10:55:50 2008
New Revision: 14157
URL: http://svn.gnome.org/viewvc/nautilus?rev=14157&view=rev

Log:
2008-05-13  Christian Neumair  <cneumair gnome org>

	* src/file-manager/fm-directory-view.c
	(action_self_properties_callback):
	* src/file-manager/nautilus-directory-view-ui.xml:
	Do not unref displayed file when opening properties window through
	location or background popup menu. Fix location popup separators.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/file-manager/fm-directory-view.c
   branches/gnome-2-22/src/file-manager/nautilus-directory-view-ui.xml

Modified: branches/gnome-2-22/src/file-manager/fm-directory-view.c
==============================================================================
--- branches/gnome-2-22/src/file-manager/fm-directory-view.c	(original)
+++ branches/gnome-2-22/src/file-manager/fm-directory-view.c	Tue May 13 10:55:50 2008
@@ -1371,11 +1371,13 @@
 	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
 
 	view = FM_DIRECTORY_VIEW (callback_data);
-	files = g_list_append (NULL, view->details->directory_as_file);
+	if (view->details->directory_as_file != NULL) {
+		files = g_list_append (NULL, nautilus_file_ref (view->details->directory_as_file));
 
-	fm_properties_window_present (files, GTK_WIDGET (view));
+		fm_properties_window_present (files, GTK_WIDGET (view));
 
-	nautilus_file_list_free (files);
+		nautilus_file_list_free (files);
+	}
 }
 
 static gboolean

Modified: branches/gnome-2-22/src/file-manager/nautilus-directory-view-ui.xml
==============================================================================
--- branches/gnome-2-22/src/file-manager/nautilus-directory-view-ui.xml	(original)
+++ branches/gnome-2-22/src/file-manager/nautilus-directory-view-ui.xml	Tue May 13 10:55:50 2008
@@ -170,17 +170,17 @@
 		<menuitem name="LocationOpenAlternate" action="LocationOpenAlternate"/>
 		<menuitem name="LocationOpenFolderWindow" action="LocationOpenFolderWindow"/>
 	</placeholder>
-	<separator/>
+	<separator name="Location After Open Separator"/>
 	<placeholder name="Clipboard Actions">
 		<menuitem name="Cut" action="LocationCut"/>
 		<menuitem name="Copy" action="LocationCopy"/>
 	</placeholder>
-	<separator/>
+	<separator name="Location After Clipboard Separator"/>
 	<placeholder name="Dangerous File Actions">
 		<menuitem name="Trash" action="LocationTrash"/>
 		<menuitem name="Delete" action="LocationDelete"/>
 	</placeholder>
-	<separator/>
+	<separator name="Location After Dangerous Separator"/>
 
 	<menuitem name="Self Mount Volume" action="Self Mount Volume"/>
 	<menuitem name="Self Unmount Volume" action="Self Unmount Volume"/>