[gedit/gnome-2-28] Order hidden files after normal files (fixes bug #599949)

[Paolo Borelli <pborelli src gnome org>]

commit c2edfd47af2997e69e2b2bd91147054097ded7c0
Author: Jesse van den Kieboom <jesse icecrew nl>
Date:   Sun Nov 15 21:28:11 2009 +0100

    Order hidden files after normal files (fixes bug #599949)

 plugins/filebrowser/gedit-file-browser-store.c |   26 +++++++++++++++--------
 1 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/plugins/filebrowser/gedit-file-browser-store.c b/plugins/filebrowser/gedit-file-browser-store.c
index 4a67c32..46d6e76 100644
--- a/plugins/filebrowser/gedit-file-browser-store.c
+++ b/plugins/filebrowser/gedit-file-browser-store.c
@@ -1051,20 +1051,28 @@ model_sort_default (FileBrowserNode * node1, FileBrowserNode * node2)
 	f2 = NODE_IS_DUMMY (node2);
 
 	if (f1 && f2)
+	{
 		return 0;
-	else if (f1)
-		return -1;
-	else if (f2)
-		return 1;
+	}
+	else if (f1 || f2)
+	{
+		return f1 ? -1 : 1;
+	}
 
 	f1 = NODE_IS_DIR (node1);
 	f2 = NODE_IS_DIR (node2);
 
-	if (f1 != f2) {
-		if (f1)
-			return -1;
-		else
-			return 1;
+	if (f1 != f2)
+	{
+		return f1 ? -1 : 1;
+	}
+
+	f1 = NODE_IS_HIDDEN (node1);
+	f2 = NODE_IS_HIDDEN (node2);
+
+	if (f1 != f2)
+	{
+		return f2 ? -1 : 1;
 	}
 
 	return collate_nodes (node1, node2);