[Xfce4-commits] r24318 - squeeze/trunk/src

[Peter de Ridder]

Author: peter
Date: 2007-01-08 19:21:07 +0000 (Mon, 08 Jan 2007)
New Revision: 24318

Modified:
   squeeze/trunk/src/archive_store.c
Log:
no more switch to root map when adding file



Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c	2007-01-08 19:10:10 UTC (rev 24317)
+++ squeeze/trunk/src/archive_store.c	2007-01-08 19:21:07 UTC (rev 24318)
@@ -218,7 +218,7 @@
 	as->icon_theme = NULL;
 	as->props._show_icons = 0;
 	as->props._show_up_dir = 1;
-	as->props._sort_folders_first = 0;
+	as->props._sort_folders_first = 1;
 	as->props._sort_case_sensitive = 1;
 	as->navigation.history = NULL;
 	as->navigation.present = NULL;
@@ -860,7 +860,6 @@
 
 	for(i = 0; i < psize; ++i)
 	{
-		g_debug("sorting %i", i);
 		store->sort_list[i] = lsq_archive_iter_nth_child(store->archive, pentry, i);
 	}
 	sq_archive_quicksort(store, 0, psize-1);
@@ -973,8 +972,12 @@
 	g_return_if_fail(archive);
 	g_return_if_fail(entry);
 
+	g_object_ref(G_OBJECT(store));
+
 	gtk_tree_view_set_model(store->treeview, NULL);
 	gtk_tree_view_set_model(store->treeview, GTK_TREE_MODEL(store));
+
+	g_object_unref(G_OBJECT(store));
 }
 
 static void
@@ -1079,6 +1082,9 @@
 {
 	g_return_if_fail(store);
 
+	if(store->archive == archive)
+		return;
+
 	GList *list_iter;
 	GSList *current_entry;
 
@@ -1409,7 +1415,6 @@
 	if(sq_archive_store_has_history(store))
 		store->navigation.present = store->navigation.present->prev;
 
-	/* sq_archive_store_sort(store); */
 	sq_archive_store_sort(store);
 	sq_archive_store_refresh(store);
 
@@ -1436,7 +1441,6 @@
 	if(sq_archive_store_has_future(store))
 		store->navigation.present = store->navigation.present->next;
 
-	/* sq_archive_store_sort(store); */
 	sq_archive_store_sort(store);
 	sq_archive_store_refresh(store);