gedit r6492 - in trunk: . plugins/filebrowser

[jessevdk svn gnome org]

Author: jessevdk
Date: Sat Sep  6 14:44:35 2008
New Revision: 6492
URL: http://svn.gnome.org/viewvc/gedit?rev=6492&view=rev

Log:
	* plugins/filebrowser/gedit-file-browser-widget.c: fixed problem with
	setting root to topmost parent for remote bookmarks


Modified:
   trunk/ChangeLog
   trunk/plugins/filebrowser/gedit-file-browser-widget.c

Modified: trunk/plugins/filebrowser/gedit-file-browser-widget.c
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-browser-widget.c	(original)
+++ trunk/plugins/filebrowser/gedit-file-browser-widget.c	Sat Sep  6 14:44:35 2008
@@ -2219,7 +2219,13 @@
 
 
 	if (uri) {
-		if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_MOUNT) {
+		/* here we check if the bookmark is a mount point, or if it
+		   is a remote bookmark. If that's the case, we will set the
+		   root to the uri of the bookmark and not try to set the
+		   topmost parent as root (since that may as well not be the
+		   mount point anymore) */
+		if ((flags & GEDIT_FILE_BOOKMARKS_STORE_IS_MOUNT) ||
+		    (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_REMOTE_BOOKMARK)) {
 			gedit_file_browser_widget_set_root (obj,
 							    uri,
 							    FALSE);