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

[Stephan Arts]

Author: stephan
Date: 2007-03-05 16:27:47 +0000 (Mon, 05 Mar 2007)
New Revision: 25117

Modified:
   squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
   squeeze/trunk/libsqueeze/archive-support-zip.c
Log:
items are now removed from archive

Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-03-05 16:20:11 UTC (rev 25116)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-03-05 16:27:47 UTC (rev 25117)
@@ -413,6 +413,13 @@
 		gchar *options = NULL;
 		gchar *tmp_file = NULL;
 		gchar *files = lsq_concat_iter_filenames(file_iters);
+
+		while(file_iters)
+		{
+			lsq_archive_iter_remove(file_iters->data);
+			file_iters = g_slist_next(file_iters);
+		}
+
 		gchar *command_skeleton = NULL;
 		if(!g_strcasecmp(thunar_vfs_mime_info_get_name(archive->mime_info), "application/x-tarz"))
 			command_skeleton = g_strdup("uncompress -c %1$s");

Modified: squeeze/trunk/libsqueeze/archive-support-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-zip.c	2007-03-05 16:20:11 UTC (rev 25116)
+++ squeeze/trunk/libsqueeze/archive-support-zip.c	2007-03-05 16:27:47 UTC (rev 25117)
@@ -291,6 +291,12 @@
 			/* FIXME: when directories are removed, append a '*' wildcard to the filenames */
 			gchar *files = lsq_concat_iter_filenames(file_iters);
 
+			while(file_iters)
+			{
+				lsq_archive_iter_remove(file_iters->data);
+				file_iters = g_slist_next(file_iters);
+			}
+
 			archive_command = lsq_archive_command_new("", archive, "zip -d %1$s %2$s", FALSE, TRUE);
 			g_object_set_data(G_OBJECT(archive_command), "files", files);
 			lsq_archive_command_run(archive_command);