[Xfce4-commits] r25399 - squeeze/trunk/libsqueeze

[Stephan Arts]

Author: stephan
Date: 2007-04-06 13:09:53 +0000 (Fri, 06 Apr 2007)
New Revision: 25399

Modified:
   squeeze/trunk/libsqueeze/archive-command.c
   squeeze/trunk/libsqueeze/archive.c
   squeeze/trunk/libsqueeze/libsqueeze.c
Log:
fixed sync-issue

Modified: squeeze/trunk/libsqueeze/archive-command.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-command.c	2007-04-06 12:41:46 UTC (rev 25398)
+++ squeeze/trunk/libsqueeze/archive-command.c	2007-04-06 13:09:53 UTC (rev 25399)
@@ -153,8 +153,6 @@
 	g_return_val_if_fail(LSQ_IS_ARCHIVE(command->archive), FALSE);
 #endif /* DEBUG */
 
-	g_object_ref(command->archive);
-
 	gboolean ret_val = command->execute(command);
 	if(ret_val)
 		g_object_ref(command->archive);

Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c	2007-04-06 12:41:46 UTC (rev 25398)
+++ squeeze/trunk/libsqueeze/archive.c	2007-04-06 13:09:53 UTC (rev 25399)
@@ -157,14 +157,6 @@
 {
 	g_return_if_fail(LSQ_IS_ARCHIVE(object));
 	LSQArchive *archive = (LSQArchive *)(object);
-	if(archive->path)
-		g_free(archive->path);
-	if(archive->path_info)
-		thunar_vfs_path_unref(archive->path_info);
-	if(archive->file_info)
-		thunar_vfs_info_unref(archive->file_info);
-	if(archive->mime_info)
-		thunar_vfs_mime_info_unref(archive->mime_info);
 
 	lsq_archive_free_iter(archive);
 	lsq_tempfs_clean_root_dir(archive);
@@ -503,8 +495,20 @@
 void
 lsq_close_archive(LSQArchive *archive)
 {
+	g_debug("%d", G_OBJECT(archive)->ref_count);
+	lsq_opened_archive_list = g_slist_remove(lsq_opened_archive_list, archive);
 	if(archive->command)
 		g_signal_handlers_disconnect_by_func(archive->command, cb_archive_archive_command_terminated, archive);
+
+	if(archive->path)
+		g_free(archive->path);
+	if(archive->path_info)
+		thunar_vfs_path_unref(archive->path_info);
+	if(archive->file_info)
+		thunar_vfs_info_unref(archive->file_info);
+	if(archive->mime_info)
+		thunar_vfs_mime_info_unref(archive->mime_info);
+
 	lsq_archive_stop(archive);
 	g_object_unref(archive);
 }

Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c	2007-04-06 12:41:46 UTC (rev 25398)
+++ squeeze/trunk/libsqueeze/libsqueeze.c	2007-04-06 13:09:53 UTC (rev 25399)
@@ -73,8 +73,7 @@
 void
 lsq_shutdown()
 {
-	//g_slist_foreach(lsq_command_builder_list, (GFunc)g_object_unref, NULL);
-	g_slist_foreach(lsq_opened_archive_list,  (GFunc)g_object_unref, NULL);
+	g_slist_foreach(lsq_opened_archive_list, (GFunc)lsq_close_archive, NULL);
 
 	g_object_unref(lsq_mime_database);
 	thunar_vfs_path_unref(lsq_relative_base_path);