gedit r6794 - in trunk: . plugins/filebrowser

[jessevdk svn gnome org]

Author: jessevdk
Date: Fri Jan  2 14:43:26 2009
New Revision: 6794
URL: http://svn.gnome.org/viewvc/gedit?rev=6794&view=rev

Log:
	* plugins/filebrowser/gedit-file-browser-bookmarks.c: keep same
	bookmarks order as in nautilus (fixes #559118)


Modified:
   trunk/ChangeLog
   trunk/plugins/filebrowser/gedit-file-bookmarks-store.c

Modified: trunk/plugins/filebrowser/gedit-file-bookmarks-store.c
==============================================================================
--- trunk/plugins/filebrowser/gedit-file-bookmarks-store.c	(original)
+++ trunk/plugins/filebrowser/gedit-file-bookmarks-store.c	Fri Jan  2 14:43:26 2009
@@ -617,15 +617,23 @@
 	gchar *n1;
 	gchar *n2;
 	gint result;
+	guint f1;
+	guint f2;
 
 	gtk_tree_model_get (model, a,
 			    GEDIT_FILE_BOOKMARKS_STORE_COLUMN_NAME, &n1,
+			    GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &f1,
 			    -1);
 	gtk_tree_model_get (model, b,
 			    GEDIT_FILE_BOOKMARKS_STORE_COLUMN_NAME, &n2,
+			    GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &f2,
 			    -1);
 
-	if (n1 == NULL && n2 == NULL)
+	/* do not sort actual bookmarks to keep same order as in nautilus */
+	if ((f1 & GEDIT_FILE_BOOKMARKS_STORE_IS_BOOKMARK) &&
+	    (f2 & GEDIT_FILE_BOOKMARKS_STORE_IS_BOOKMARK))
+		result = 0;
+	else if (n1 == NULL && n2 == NULL)
 		result = 0;
 	else if (n1 == NULL)
 		result = -1;