[Xfce4-commits] r25383 - in squeeze/trunk: libsqueeze src

[Stephan Arts]

Author: stephan
Date: 2007-04-04 21:06:14 +0000 (Wed, 04 Apr 2007)
New Revision: 25383

Modified:
   squeeze/trunk/libsqueeze/command-builder.c
   squeeze/trunk/src/archive_store.c
Log:
Cleaned up command-builder code a bit
Might have solved bug #3095


Modified: squeeze/trunk/libsqueeze/command-builder.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder.c	2007-04-04 18:42:18 UTC (rev 25382)
+++ squeeze/trunk/libsqueeze/command-builder.c	2007-04-04 21:06:14 UTC (rev 25383)
@@ -33,7 +33,7 @@
 static void
 lsq_command_builder_class_init(LSQCommandBuilderClass *);
 static void
-lsq_command_builder_init(LSQCommandBuilder *archive);
+lsq_command_builder_init(LSQCommandBuilder *);
 static void
 lsq_command_builder_dispose(GObject *object);
 static void

Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c	2007-04-04 18:42:18 UTC (rev 25382)
+++ squeeze/trunk/src/archive_store.c	2007-04-04 21:06:14 UTC (rev 25383)
@@ -1268,7 +1268,6 @@
 	/* notify all we have a new archive and connect with the archive */
 	g_signal_emit(store, sq_archive_store_signals[SQ_ARCHIVE_STORE_SIGNAL_NEW_ARCHIVE], 0, NULL);
 	g_signal_connect(store->archive, "refreshed", G_CALLBACK(cb_sq_archive_store_archive_refreshed), store);
-	/* g_signal_connect(store->archive, "lsq_path_changed", G_CALLBACK(cb_sq_archive_store_archive_path_changed), store); */
 }
 
 LSQArchiveIter *
@@ -1575,6 +1574,14 @@
 	SQArchiveStore *store = SQ_ARCHIVE_STORE(object);
 	if(store->archive)
 	{
+		GList *list_iter;
+		for(list_iter = store->navigation.history; list_iter; list_iter = list_iter->next)
+			lsq_archive_iter_unref(list_iter->data);
+
+		g_list_free(store->navigation.history);
+		if(store->navigation.trailing)
+			lsq_archive_iter_unref(store->navigation.trailing);
+
 		g_object_unref(store->archive);
 		store->archive = NULL;
 	}