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

[Stephan Arts]

Author: stephan
Date: 2007-03-23 16:02:24 +0000 (Fri, 23 Mar 2007)
New Revision: 25269

Modified:
   squeeze/trunk/libsqueeze/command-builder-gnu-tar.c
   squeeze/trunk/libsqueeze/command-builder-rar.c
   squeeze/trunk/libsqueeze/command-builder-zip.c
   squeeze/trunk/libsqueeze/internals.h
Log:
fixed remove functions, now use concat_iter_filenames

Modified: squeeze/trunk/libsqueeze/command-builder-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-gnu-tar.c	2007-03-23 15:48:50 UTC (rev 25268)
+++ squeeze/trunk/libsqueeze/command-builder-gnu-tar.c	2007-03-23 16:02:24 UTC (rev 25269)
@@ -259,11 +259,11 @@
 
 
 static LSQArchiveCommand *
-lsq_command_builder_gnu_tar_build_remove(LSQCommandBuilder *builder, LSQArchive *archive, GSList *filenames)
+lsq_command_builder_gnu_tar_build_remove(LSQCommandBuilder *builder, LSQArchive *archive, GSList *file_iters)
 {
 	gchar *options = NULL;
 	gchar *tmp_file = NULL;
-	gchar *files = lsq_concat_filenames(filenames);
+	gchar *files = lsq_concat_iter_filenames(file_iters);
 	const gchar *compress_skeleton = NULL;
 	const gchar *decompress_skeleton = NULL;
 	LSQArchiveCommand *remove_macro = NULL;

Modified: squeeze/trunk/libsqueeze/command-builder-rar.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-rar.c	2007-03-23 15:48:50 UTC (rev 25268)
+++ squeeze/trunk/libsqueeze/command-builder-rar.c	2007-03-23 16:02:24 UTC (rev 25269)
@@ -135,9 +135,9 @@
 }
 
 static LSQArchiveCommand *
-lsq_command_builder_rar_build_remove(LSQCommandBuilder *builder, LSQArchive *archive, GSList *filenames)
+lsq_command_builder_rar_build_remove(LSQCommandBuilder *builder, LSQArchive *archive, GSList *iter_files)
 {
-	gchar *files = lsq_concat_filenames(filenames);
+	gchar *files = lsq_concat_iter_filenames(iter_files);
 
 	LSQArchiveCommand *spawn = lsq_spawn_command_new("Remove", archive, "rar -d %1$s %2$s", files, NULL, NULL);
 

Modified: squeeze/trunk/libsqueeze/command-builder-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-zip.c	2007-03-23 15:48:50 UTC (rev 25268)
+++ squeeze/trunk/libsqueeze/command-builder-zip.c	2007-03-23 16:02:24 UTC (rev 25269)
@@ -140,9 +140,9 @@
 }
 
 static LSQArchiveCommand *
-lsq_command_builder_zip_build_remove(LSQCommandBuilder *builder, LSQArchive *archive, GSList *filenames)
+lsq_command_builder_zip_build_remove(LSQCommandBuilder *builder, LSQArchive *archive, GSList *file_iters)
 {
-	gchar *files = lsq_concat_filenames(filenames);
+	gchar *files = lsq_concat_iter_filenames(file_iters);
 
 	LSQArchiveCommand *spawn = lsq_spawn_command_new("Remove", archive, "zip -d %1$s %2$s", files, NULL, NULL);
 

Modified: squeeze/trunk/libsqueeze/internals.h
===================================================================
--- squeeze/trunk/libsqueeze/internals.h	2007-03-23 15:48:50 UTC (rev 25268)
+++ squeeze/trunk/libsqueeze/internals.h	2007-03-23 16:02:24 UTC (rev 25269)
@@ -28,6 +28,8 @@
 
 gchar *
 lsq_concat_filenames(GSList *filenames);
+gchar *
+lsq_concat_iter_filenames(GSList *file_iters);
 
 LSQArchive *
 lsq_opened_archive_get_archive(gchar *path);