[Xfce4-commits] r25334 - in squeeze/trunk: docs/reference/libsqueeze/tmpl libsqueeze src
Stephan Arts
stephan at xfce.org
Thu Mar 29 21:17:11 CEST 2007
Author: stephan
Date: 2007-03-29 19:17:11 +0000 (Thu, 29 Mar 2007)
New Revision: 25334
Added:
squeeze/trunk/libsqueeze/remove-command.c
squeeze/trunk/libsqueeze/remove-command.h
Modified:
squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-gnu-tar.sgml
squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-zip.sgml
squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support.sgml
squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml
squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml
squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze.sgml
squeeze/trunk/libsqueeze/Makefile.am
squeeze/trunk/libsqueeze/archive-command.c
squeeze/trunk/libsqueeze/archive-command.h
squeeze/trunk/libsqueeze/command-builder-compr.c
squeeze/trunk/libsqueeze/command-builder-gnu-tar.c
squeeze/trunk/libsqueeze/command-builder-zip.c
squeeze/trunk/libsqueeze/command-builder.c
squeeze/trunk/libsqueeze/libsqueeze-module.h
squeeze/trunk/libsqueeze/macro-command.c
squeeze/trunk/libsqueeze/macro-command.h
squeeze/trunk/src/main_window.c
Log:
fixed remove
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-gnu-tar.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-gnu-tar.sgml 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-gnu-tar.sgml 2007-03-29 19:17:11 UTC (rev 25334)
@@ -17,70 +17,3 @@
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### STRUCT LSQArchiveSupportGnuTar ##### -->
-<para>
-
-</para>
-
- at parent:
- at app_name:
- at _extr_overwrite:
- at _extr_touch:
- at _extr_strip:
- at _extr_keep_old:
- at _extr_keep_newer:
- at _add_mode:
- at _view_size:
- at _view_date:
- at _view_time:
- at _view_owner:
- at _view_rights:
-
-<!-- ##### FUNCTION lsq_archive_support_gnu_tar_new ##### -->
-<para>
-
-</para>
-
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_gnu_tar_add ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_gnu_tar_extract ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_gnu_tar_remove ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_gnu_tar_refresh ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Returns:
-
-
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-zip.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-zip.sgml 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support-zip.sgml 2007-03-29 19:17:11 UTC (rev 25334)
@@ -17,27 +17,3 @@
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### STRUCT LSQArchiveSupportZip ##### -->
-<para>
-
-</para>
-
- at parent:
- at _extr_overwrite:
- at _extr_password:
- at _view_size:
- at _view_time:
- at _view_date:
- at _view_ratio:
- at _view_length:
- at _view_method:
- at _view_crc_32:
-
-<!-- ##### FUNCTION lsq_archive_support_zip_new ##### -->
-<para>
-
-</para>
-
- at Returns:
-
-
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support.sgml 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/archive-support.sgml 2007-03-29 19:17:11 UTC (rev 25334)
@@ -17,282 +17,3 @@
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### STRUCT LSQCustomAction ##### -->
-<para>
-
-</para>
-
- at name:
- at nick:
- at blurb:
- at icon:
- at func:
- at callback:
- at support:
- at user_data:
-
-<!-- ##### USER_FUNCTION LSQCustomActionPreFunc ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Returns:
-
-
-<!-- ##### USER_FUNCTION LSQCustomActionFunc ##### -->
-<para>
-
-</para>
-
- at support:
- at Param2:
- at Param3:
- at user_data:
- at Returns:
-
-
-<!-- ##### USER_FUNCTION LSQCustomActionPostFunc ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Returns:
-
-
-<!-- ##### STRUCT LSQArchiveSupport ##### -->
-<para>
-
-</para>
-
- at parent:
- at id:
- at mime:
- at custom_action:
- at max_n_files:
- at add:
- at extract:
- at remove:
- at refresh:
-
-<!-- ##### FUNCTION lsq_archive_support_new ##### -->
-<para>
-
-</para>
-
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_add_mime ##### -->
-<para>
-
-</para>
-
- at support:
- at mime:
-
-
-<!-- ##### FUNCTION lsq_archive_support_mime_supported ##### -->
-<para>
-
-</para>
-
- at Param1:
- at mime:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_register_support ##### -->
-<para>
-
-</para>
-
- at support:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_get_support_for_mime ##### -->
-<para>
-
-</para>
-
- at mime_info:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_get_support_for_mime_from_slist ##### -->
-<para>
-
-</para>
-
- at list:
- at mime:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_lookup_mime ##### -->
-<para>
-
-</para>
-
- at support_mime:
- at mime:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_lookup_support ##### -->
-<para>
-
-</para>
-
- at support:
- at mime:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_add ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_extract ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Param4:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_remove ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_refresh ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_list_properties ##### -->
-<para>
-
-</para>
-
- at support:
- at Param2:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_install_action ##### -->
-<para>
-
-</para>
-
- at support:
- at action:
-
-
-<!-- ##### FUNCTION lsq_archive_support_find_action ##### -->
-<para>
-
-</para>
-
- at support:
- at name:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_archive_support_list_actions ##### -->
-<para>
-
-</para>
-
- at support:
- at n_actions:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_custom_action_new ##### -->
-<para>
-
-</para>
-
- at name:
- at nick:
- at blurb:
- at icon:
- at func:
- at support:
- at user_data:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_custom_action_get_name ##### -->
-<para>
-
-</para>
-
- at action:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_custom_action_get_nick ##### -->
-<para>
-
-</para>
-
- at action:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_custom_action_get_blurb ##### -->
-<para>
-
-</para>
-
- at action:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_custom_action_get_icon_name ##### -->
-<para>
-
-</para>
-
- at action:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_custom_action_execute ##### -->
-<para>
-
-</para>
-
- at action:
- at archive:
- at callback:
-
-
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/archive.sgml 2007-03-29 19:17:11 UTC (rev 25334)
@@ -17,18 +17,12 @@
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### STRUCT LSQEntry ##### -->
+<!-- ##### STRUCT LSQArchiveIter ##### -->
<para>
</para>
-<!-- ##### TYPEDEF LSQArchiveIter ##### -->
-<para>
-
-</para>
-
-
<!-- ##### STRUCT LSQArchive ##### -->
<para>
@@ -39,14 +33,13 @@
@path_info:
@file_info:
@mime_info:
- at entry_n_property:
- at entry_property_types:
- at entry_property_names:
@root_entry:
- at support:
- at command_queue:
+ at command:
+ at builder:
+ at settings:
@temp_dir:
@monitor_list:
+ at pool:
<!-- ##### FUNCTION lsq_archive_new ##### -->
<para>
@@ -58,7 +51,7 @@
@Returns:
-<!-- ##### FUNCTION lsq_archive_get_filename ##### -->
+<!-- ##### FUNCTION lsq_archive_get_status ##### -->
<para>
</para>
@@ -67,45 +60,40 @@
@Returns:
-<!-- ##### FUNCTION lsq_archive_iter_is_directory ##### -->
+<!-- ##### FUNCTION lsq_archive_get_filename ##### -->
<para>
</para>
- at Param1:
- at Param2:
+ at archive:
@Returns:
-<!-- ##### FUNCTION lsq_archive_iter_n_children ##### -->
+<!-- ##### FUNCTION lsq_archive_iter_is_directory ##### -->
<para>
</para>
@Param1:
- at Param2:
@Returns:
-<!-- ##### FUNCTION lsq_archive_iter_nth_child ##### -->
+<!-- ##### FUNCTION lsq_archive_iter_n_children ##### -->
<para>
</para>
@Param1:
- at Param2:
- at Param3:
@Returns:
-<!-- ##### FUNCTION lsq_archive_iter_add_child ##### -->
+<!-- ##### FUNCTION lsq_archive_iter_nth_child ##### -->
<para>
</para>
@Param1:
@Param2:
- at Param3:
@Returns:
@@ -116,74 +104,9 @@
@Param1:
@Param2:
- at Param3:
@Returns:
-<!-- ##### FUNCTION lsq_archive_iter_set_mime ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
-
-
-<!-- ##### FUNCTION lsq_archive_iter_set_prop_str ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Param4:
-
-
-<!-- ##### FUNCTION lsq_archive_iter_set_prop_uint ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Param4:
-
-
-<!-- ##### FUNCTION lsq_archive_iter_set_prop_uint64 ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Param4:
-
-
-<!-- ##### FUNCTION lsq_archive_iter_set_prop_value ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Param3:
- at Param4:
-
-
-<!-- ##### FUNCTION lsq_archive_iter_set_props ##### -->
-<para>
-
-</para>
-
- at Param1:
- at Param2:
- at Varargs:
-
-
<!-- ##### FUNCTION lsq_archive_iter_set_propsv ##### -->
<para>
@@ -191,7 +114,6 @@
@Param1:
@Param2:
- at Param3:
<!-- ##### FUNCTION lsq_archive_iter_get_prop_value ##### -->
@@ -199,31 +121,19 @@
</para>
- at archive:
@iter:
@n:
@value:
@Returns:
-<!-- ##### FUNCTION lsq_archive_iter_get_icon_name ##### -->
-<para>
-
-</para>
-
- at archive:
- at iter:
- at value:
- at icon_theme:
-
-
<!-- ##### FUNCTION lsq_archive_add_file ##### -->
<para>
</para>
- at archive:
- at path:
+ at Param1:
+ at Param2:
@Returns:
@@ -257,12 +167,3 @@
@Returns:
-<!-- ##### FUNCTION lsq_archive_n_property ##### -->
-<para>
-
-</para>
-
- at archive:
- at Returns:
-
-
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze-unused.sgml 2007-03-29 19:17:11 UTC (rev 25334)
@@ -14,6 +14,104 @@
@LSQ_ARCHIVESTATUS_CUSTOM:
@LSQ_ARCHIVESTATUS_USERBREAK:
+<!-- ##### STRUCT LSQArchiveSupport ##### -->
+<para>
+
+</para>
+
+ at parent:
+ at id:
+ at mime:
+ at custom_action:
+ at max_n_files:
+ at add:
+ at extract:
+ at remove:
+ at refresh:
+
+<!-- ##### STRUCT LSQArchiveSupportGnuTar ##### -->
+<para>
+
+</para>
+
+ at parent:
+ at app_name:
+ at _extr_overwrite:
+ at _extr_touch:
+ at _extr_strip:
+ at _extr_keep_old:
+ at _extr_keep_newer:
+ at _add_mode:
+ at _view_size:
+ at _view_date:
+ at _view_time:
+ at _view_owner:
+ at _view_rights:
+
+<!-- ##### STRUCT LSQArchiveSupportZip ##### -->
+<para>
+
+</para>
+
+ at parent:
+ at _extr_overwrite:
+ at _extr_password:
+ at _view_size:
+ at _view_time:
+ at _view_date:
+ at _view_ratio:
+ at _view_length:
+ at _view_method:
+ at _view_crc_32:
+
+<!-- ##### STRUCT LSQCustomAction ##### -->
+<para>
+
+</para>
+
+ at name:
+ at nick:
+ at blurb:
+ at icon:
+ at func:
+ at callback:
+ at support:
+ at user_data:
+
+<!-- ##### USER_FUNCTION LSQCustomActionFunc ##### -->
+<para>
+
+</para>
+
+ at support:
+ at Param2:
+ at Param3:
+ at user_data:
+ at Returns:
+
+<!-- ##### USER_FUNCTION LSQCustomActionPostFunc ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Returns:
+
+<!-- ##### USER_FUNCTION LSQCustomActionPreFunc ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Returns:
+
+<!-- ##### STRUCT LSQEntry ##### -->
+<para>
+
+</para>
+
+
<!-- ##### STRUCT LSQSList ##### -->
<para>
@@ -22,15 +120,15 @@
@entry:
@next:
-<!-- ##### FUNCTION lsq_archive_get_old_status ##### -->
+<!-- ##### FUNCTION lsq_archive_command_run ##### -->
<para>
</para>
- at archive:
+ at archive_command:
@Returns:
-<!-- ##### FUNCTION lsq_archive_get_status ##### -->
+<!-- ##### FUNCTION lsq_archive_get_old_status ##### -->
<para>
</para>
@@ -46,6 +144,16 @@
@archive:
@Returns:
+<!-- ##### FUNCTION lsq_archive_iter_add_child ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Returns:
+
<!-- ##### FUNCTION lsq_archive_iter_del_child ##### -->
<para>
@@ -56,6 +164,82 @@
@Param3:
@Returns:
+<!-- ##### FUNCTION lsq_archive_iter_get_icon_name ##### -->
+<para>
+
+</para>
+
+ at archive:
+ at iter:
+ at value:
+ at icon_theme:
+
+<!-- ##### FUNCTION lsq_archive_iter_set_mime ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+
+<!-- ##### FUNCTION lsq_archive_iter_set_prop_str ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Param4:
+
+<!-- ##### FUNCTION lsq_archive_iter_set_prop_uint ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Param4:
+
+<!-- ##### FUNCTION lsq_archive_iter_set_prop_uint64 ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Param4:
+
+<!-- ##### FUNCTION lsq_archive_iter_set_prop_value ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Param4:
+
+<!-- ##### FUNCTION lsq_archive_iter_set_props ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Varargs:
+
+<!-- ##### FUNCTION lsq_archive_n_property ##### -->
+<para>
+
+</para>
+
+ at archive:
+ at Returns:
+
<!-- ##### FUNCTION lsq_archive_set_property_type ##### -->
<para>
@@ -83,6 +267,173 @@
@archive:
@status:
+<!-- ##### FUNCTION lsq_archive_support_add ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_add_mime ##### -->
+<para>
+
+</para>
+
+ at support:
+ at mime:
+
+<!-- ##### FUNCTION lsq_archive_support_extract ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Param4:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_find_action ##### -->
+<para>
+
+</para>
+
+ at support:
+ at name:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_gnu_tar_add ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_gnu_tar_extract ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_gnu_tar_new ##### -->
+<para>
+
+</para>
+
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_gnu_tar_refresh ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_gnu_tar_remove ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_install_action ##### -->
+<para>
+
+</para>
+
+ at support:
+ at action:
+
+<!-- ##### FUNCTION lsq_archive_support_list_actions ##### -->
+<para>
+
+</para>
+
+ at support:
+ at n_actions:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_list_properties ##### -->
+<para>
+
+</para>
+
+ at support:
+ at Param2:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_lookup_mime ##### -->
+<para>
+
+</para>
+
+ at support_mime:
+ at mime:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_lookup_support ##### -->
+<para>
+
+</para>
+
+ at support:
+ at mime:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_mime_supported ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at mime:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_new ##### -->
+<para>
+
+</para>
+
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_refresh ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_remove ##### -->
+<para>
+
+</para>
+
+ at Param1:
+ at Param2:
+ at Param3:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_archive_support_zip_new ##### -->
+<para>
+
+</para>
+
+ at Returns:
+
<!-- ##### FUNCTION lsq_concat_filenames ##### -->
<para>
@@ -91,6 +442,69 @@
@filenames:
@Returns:
+<!-- ##### FUNCTION lsq_convert_mime_to_icon_name ##### -->
+<para>
+
+</para>
+
+ at icon_theme:
+ at value:
+
+<!-- ##### FUNCTION lsq_custom_action_execute ##### -->
+<para>
+
+</para>
+
+ at action:
+ at archive:
+ at callback:
+
+<!-- ##### FUNCTION lsq_custom_action_get_blurb ##### -->
+<para>
+
+</para>
+
+ at action:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_custom_action_get_icon_name ##### -->
+<para>
+
+</para>
+
+ at action:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_custom_action_get_name ##### -->
+<para>
+
+</para>
+
+ at action:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_custom_action_get_nick ##### -->
+<para>
+
+</para>
+
+ at action:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_custom_action_new ##### -->
+<para>
+
+</para>
+
+ at name:
+ at nick:
+ at blurb:
+ at icon:
+ at func:
+ at support:
+ at user_data:
+ at Returns:
+
<!-- ##### FUNCTION lsq_execute ##### -->
<para>
@@ -104,6 +518,23 @@
@f_err:
@Returns:
+<!-- ##### FUNCTION lsq_get_support_for_mime ##### -->
+<para>
+
+</para>
+
+ at mime_info:
+ at Returns:
+
+<!-- ##### FUNCTION lsq_get_support_for_mime_from_slist ##### -->
+<para>
+
+</para>
+
+ at list:
+ at mime:
+ at Returns:
+
<!-- ##### FUNCTION lsq_opened_archive_get_archive ##### -->
<para>
@@ -112,6 +543,14 @@
@path:
@Returns:
+<!-- ##### FUNCTION lsq_register_support ##### -->
+<para>
+
+</para>
+
+ at support:
+ at Returns:
+
<!-- ##### FUNCTION lsq_slist_free ##### -->
<para>
@@ -137,3 +576,11 @@
@list:
@Returns:
+<!-- ##### FUNCTION lsq_stop_archive_child ##### -->
+<para>
+
+</para>
+
+ at archive:
+ at Returns:
+
Modified: squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze.sgml
===================================================================
--- squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze.sgml 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/docs/reference/libsqueeze/tmpl/libsqueeze.sgml 2007-03-29 19:17:11 UTC (rev 25334)
@@ -61,21 +61,3 @@
@archive:
-<!-- ##### FUNCTION lsq_stop_archive_child ##### -->
-<para>
-
-</para>
-
- at archive:
- at Returns:
-
-
-<!-- ##### FUNCTION lsq_convert_mime_to_icon_name ##### -->
-<para>
-
-</para>
-
- at icon_theme:
- at value:
-
-
Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/Makefile.am 2007-03-29 19:17:11 UTC (rev 25334)
@@ -13,6 +13,7 @@
archive-command.c archive-command.h \
spawn-command.c spawn-command.h \
macro-command.c macro-command.h \
+ remove-command.c remove-command.h \
xfce-launch-command.c xfce-launch-command.h \
archive-tempfs.c archive-tempfs.h \
builder-settings.c builder-settings.h \
Modified: squeeze/trunk/libsqueeze/archive-command.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-command.c 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/archive-command.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -40,6 +40,9 @@
static void
lsq_archive_command_finalize(GObject *object);
+static gboolean
+lsq_archive_command_remove_iters(LSQArchiveCommand *command);
+
static GObjectClass *parent_class;
enum
Modified: squeeze/trunk/libsqueeze/archive-command.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-command.h 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/archive-command.h 2007-03-29 19:17:11 UTC (rev 25334)
@@ -51,5 +51,10 @@
LSQArchive *archive,
LSQCommandFunc exec_command);
+LSQArchiveCommand *
+lsq_archive_command_new_remove(const gchar *comment,
+ LSQArchive *archive,
+ GSList *iters);
+
G_END_DECLS
#endif /* __LIBSQUEEZE_ARCHIVE_COMMAND_H__ */
Modified: squeeze/trunk/libsqueeze/command-builder-compr.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-compr.c 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/command-builder-compr.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -104,7 +104,7 @@
command_builder->build_remove = lsq_command_builder_compr_build_remove;
command_builder->build_refresh = lsq_command_builder_compr_build_refresh;
- command_builder->mime_types = g_new0(gchar *, 4);
+ command_builder->mime_types = g_new0(gchar *, 5);
command_builder->mime_types[0] = "application/x-gzip";
command_builder->mime_types[1] = "application/x-bzip";
command_builder->mime_types[2] = "application/x-lzop";
Modified: squeeze/trunk/libsqueeze/command-builder-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-gnu-tar.c 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/command-builder-gnu-tar.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -248,7 +248,7 @@
files,
options,
tmp_file);
- add_macro = lsq_macro_command_new(NULL, archive);
+ add_macro = lsq_macro_command_new(archive);
if(decompress)
{
lsq_macro_command_append(LSQ_MACRO_COMMAND(add_macro), decompress);
@@ -310,7 +310,7 @@
NULL,
NULL,
tmp_file);
- remove_macro = lsq_macro_command_new(NULL, archive);
+ remove_macro = lsq_macro_command_new(archive);
lsq_macro_command_append(LSQ_MACRO_COMMAND(remove_macro), decompress);
g_object_unref(decompress);
lsq_macro_command_append(LSQ_MACRO_COMMAND(remove_macro), spawn);
@@ -318,6 +318,10 @@
lsq_macro_command_append(LSQ_MACRO_COMMAND(remove_macro), compress);
g_object_unref(compress);
+ LSQArchiveCommand *remove = lsq_remove_command_new(_("Removing"), archive, file_iters);
+ lsq_macro_command_append(LSQ_MACRO_COMMAND(remove_macro), remove);
+ g_object_unref(remove);
+
if(!lsq_spawn_command_set_parse_func(LSQ_SPAWN_COMMAND(compress), 1, lsq_command_builder_gnu_tar_compress_parse_output, NULL))
{
g_critical("Could not set compress parse function");
Modified: squeeze/trunk/libsqueeze/command-builder-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-zip.c 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/command-builder-zip.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -161,9 +161,16 @@
gchar *files = lsq_concat_iter_filenames(file_iters);
LSQArchiveCommand *spawn = lsq_spawn_command_new(_("Removing"), archive, "zip -d %1$s %2$s", files, NULL, NULL);
+ LSQArchiveCommand *macro = lsq_macro_command_new(archive);
+ LSQArchiveCommand *remove = lsq_remove_command_new(_("Removing"), archive, file_iters);
+ lsq_macro_command_append(LSQ_MACRO_COMMAND(macro), spawn);
+ g_object_unref(spawn);
+ lsq_macro_command_append(LSQ_MACRO_COMMAND(macro), remove);
+ g_object_unref(remove);
+
g_free(files);
- return spawn;
+ return macro;
}
static LSQArchiveCommand *
Modified: squeeze/trunk/libsqueeze/command-builder.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder.c 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/command-builder.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -121,7 +121,7 @@
LSQArchiveCommand *extract = builder->build_extract(builder, archive, lsq_tempfs_get_root_dir(archive), files);
LSQArchiveCommand *launch = lsq_xfce_launch_command_new("Execute",
archive, lsq_tempfs_get_root_dir(archive), files);
- LSQArchiveCommand *macro = lsq_macro_command_new("Open", archive);
+ LSQArchiveCommand *macro = lsq_macro_command_new(archive);
lsq_macro_command_append(LSQ_MACRO_COMMAND(macro), extract);
lsq_macro_command_append(LSQ_MACRO_COMMAND(macro), launch);
Modified: squeeze/trunk/libsqueeze/libsqueeze-module.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze-module.h 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/libsqueeze-module.h 2007-03-29 19:17:11 UTC (rev 25334)
@@ -23,6 +23,7 @@
#include <libsqueeze/archive-command.h>
#include <libsqueeze/macro-command.h>
#include <libsqueeze/spawn-command.h>
+#include <libsqueeze/remove-command.h>
#include <libsqueeze/xfce-launch-command.h>
#include <libsqueeze/builder-settings.h>
#include <libsqueeze/command-builder.h>
Modified: squeeze/trunk/libsqueeze/macro-command.c
===================================================================
--- squeeze/trunk/libsqueeze/macro-command.c 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/macro-command.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -123,13 +123,12 @@
/**
* lsq_macro_command_new:
- * @comment: a description, describing what the command does
* @archive: the archive the command modifies
*
* Returns: a new LSQMacroCommand object
*/
LSQArchiveCommand *
-lsq_macro_command_new(const gchar *comment, LSQArchive *archive)
+lsq_macro_command_new(LSQArchive *archive)
{
LSQArchiveCommand *archive_command;
@@ -137,9 +136,6 @@
archive_command->archive = archive;
- if(comment)
- archive_command->comment = g_strdup(comment);
-
return archive_command;
}
@@ -166,6 +162,8 @@
void
lsq_macro_command_append(LSQMacroCommand *command, LSQArchiveCommand *sub_command)
{
+ if(!command->command_queue)
+ LSQ_ARCHIVE_COMMAND(command)->comment = sub_command->comment;
g_object_ref(sub_command);
command->command_queue = g_slist_append(command->command_queue, sub_command);
}
Modified: squeeze/trunk/libsqueeze/macro-command.h
===================================================================
--- squeeze/trunk/libsqueeze/macro-command.h 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/libsqueeze/macro-command.h 2007-03-29 19:17:11 UTC (rev 25334)
@@ -54,7 +54,7 @@
GType lsq_macro_command_get_type();
-LSQArchiveCommand * lsq_macro_command_new(const gchar *comment, LSQArchive *archive);
+LSQArchiveCommand * lsq_macro_command_new(LSQArchive *archive);
void lsq_macro_command_append(LSQMacroCommand *command, LSQArchiveCommand *sub_command);
G_END_DECLS
Added: squeeze/trunk/libsqueeze/remove-command.c
===================================================================
--- squeeze/trunk/libsqueeze/remove-command.c (rev 0)
+++ squeeze/trunk/libsqueeze/remove-command.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -0,0 +1,163 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <string.h>
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <glib-object.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <thunar-vfs/thunar-vfs.h>
+
+#include "libsqueeze-module.h"
+#include "archive-iter.h"
+#include "archive-command.h"
+#include "remove-command.h"
+#include "archive.h"
+
+static void
+lsq_remove_command_class_init(LSQRemoveCommandClass *);
+static void
+lsq_remove_command_init(LSQRemoveCommand *);
+static void
+lsq_remove_command_dispose(GObject *object);
+static void
+lsq_remove_command_finalize(GObject *object);
+
+static gboolean
+lsq_remove_command_execute(LSQArchiveCommand *command);
+static gboolean
+lsq_remove_command_stop(LSQArchiveCommand *command);
+
+static GObjectClass *parent_class;
+
+GType
+lsq_remove_command_get_type ()
+{
+ static GType lsq_remove_command_type = 0;
+
+ if (!lsq_remove_command_type)
+ {
+ static const GTypeInfo lsq_remove_command_info =
+ {
+ sizeof (LSQRemoveCommandClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) lsq_remove_command_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (LSQRemoveCommand),
+ 0,
+ (GInstanceInitFunc) lsq_remove_command_init,
+ NULL
+ };
+
+ lsq_remove_command_type = g_type_register_static (LSQ_TYPE_ARCHIVE_COMMAND, "LSQRemoveCommand", &lsq_remove_command_info, 0);
+ }
+ return lsq_remove_command_type;
+}
+
+static void
+lsq_remove_command_class_init(LSQRemoveCommandClass *remove_command_class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS(remove_command_class);
+
+ object_class->dispose = lsq_remove_command_dispose;
+ object_class->finalize = lsq_remove_command_finalize;
+
+ parent_class = g_type_class_peek(LSQ_TYPE_ARCHIVE_COMMAND);
+
+}
+
+static void
+lsq_remove_command_init(LSQRemoveCommand *remove_command)
+{
+ LSQArchiveCommand *command = LSQ_ARCHIVE_COMMAND(remove_command);
+
+ command->execute = lsq_remove_command_execute;
+ command->stop = lsq_remove_command_stop;
+}
+
+/**
+ * lsq_remove_command_dispose:
+ *
+ * @object: LSQRemoveCommand object
+ *
+ */
+static void
+lsq_remove_command_dispose(GObject *object)
+{
+ parent_class->dispose(object);
+}
+
+/**
+ * lsq_remove_command_finalize:
+ *
+ * @object: LSQRemoveCommand object
+ *
+ */
+static void
+lsq_remove_command_finalize(GObject *object)
+{
+ parent_class->finalize(object);
+}
+
+
+/**
+ * lsq_remove_command_new:
+ * @comment: a description, describing what the command does
+ * @archive: the archive the command modifies
+ *
+ * Returns: a new LSQRemoveCommand object
+ */
+LSQArchiveCommand *
+lsq_remove_command_new(const gchar *comment, LSQArchive *archive, GSList *iters)
+{
+ LSQArchiveCommand *archive_command;
+
+ archive_command = g_object_new(LSQ_TYPE_REMOVE_COMMAND, NULL);
+
+ archive_command->archive = archive;
+
+ if(comment)
+ archive_command->comment = g_strdup(comment);
+
+ g_object_set_data(G_OBJECT(archive_command), "entries", g_slist_copy(iters));
+
+ archive_command->execute = lsq_remove_command_execute;
+
+ return archive_command;
+}
+
+static gboolean
+lsq_remove_command_execute(LSQArchiveCommand *command)
+{
+ GSList *iters = g_object_get_data(G_OBJECT(command), "entries");
+
+ g_slist_foreach(iters, (GFunc)lsq_archive_iter_remove, NULL);
+
+ g_slist_free(iters);
+
+ return TRUE;
+}
+
+static gboolean
+lsq_remove_command_stop(LSQArchiveCommand *command)
+{
+ return TRUE;
+}
Added: squeeze/trunk/libsqueeze/remove-command.h
===================================================================
--- squeeze/trunk/libsqueeze/remove-command.h (rev 0)
+++ squeeze/trunk/libsqueeze/remove-command.h 2007-03-29 19:17:11 UTC (rev 25334)
@@ -0,0 +1,59 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __LIBSQUEEZE_REMOVE_COMMAND_H__
+#define __LIBSQUEEZE_REMOVE_COMMAND_H__
+G_BEGIN_DECLS
+
+#define LSQ_TYPE_REMOVE_COMMAND lsq_remove_command_get_type()
+
+#define LSQ_REMOVE_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_REMOVE_COMMAND, \
+ LSQRemoveCommand))
+
+#define LSQ_IS_REMOVE_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ LSQ_TYPE_REMOVE_COMMAND))
+
+#define LSQ_REMOVE_COMMAND_CLASS(class) ( \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_REMOVE_COMMAND, \
+ LSQRemoveCommandClass))
+
+#define LSQ_IS_REMOVE_COMMAND_CLASS(class) ( \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
+ LSQ_TYPE_REMOVE_COMMAND))
+
+typedef struct _LSQRemoveCommand LSQRemoveCommand;
+
+struct _LSQRemoveCommand
+{
+ LSQArchiveCommand parent;
+};
+
+typedef struct _LSQRemoveCommandClass LSQRemoveCommandClass;
+
+struct _LSQRemoveCommandClass
+{
+ LSQArchiveCommandClass parent;
+};
+
+GType lsq_remove_command_get_type();
+
+LSQArchiveCommand * lsq_remove_command_new(const gchar *comment, LSQArchive *archive, GSList *);
+
+G_END_DECLS
+#endif /* __LIBSQUEEZE_REMOVE_COMMAND_H__ */
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2007-03-29 18:36:54 UTC (rev 25333)
+++ squeeze/trunk/src/main_window.c 2007-03-29 19:17:11 UTC (rev 25334)
@@ -770,7 +770,7 @@
filenames = sq_add_dialog_get_filenames(SQ_ADD_DIALOG(dialog));
if(filenames)
{
- if(lsq_archive_add(lp_archive, filenames))
+ if(!lsq_archive_add(lp_archive, filenames))
{
GtkWidget *warning_dialog = gtk_message_dialog_new(GTK_WINDOW(window),
GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -803,7 +803,7 @@
gtk_widget_hide(dialog);
sq_notebook_get_active_archive(SQ_NOTEBOOK(window->notebook), &lp_archive);
/* gtk_tree_view_set_model(sq_notebook_get_active_tree_view(SQ_NOTEBOOK(window->notebook)), NULL); */
- if(lsq_archive_remove(lp_archive, filenames))
+ if(!lsq_archive_remove(lp_archive, filenames))
{
GtkWidget *warning_dialog = gtk_message_dialog_new(GTK_WINDOW(window),
GTK_DIALOG_DESTROY_WITH_PARENT,
More information about the Xfce4-commits
mailing list