[Xfce4-commits] r25191 - squeeze/trunk/libsqueeze
Stephan Arts
stephan at xfce.org
Sun Mar 18 14:10:51 CET 2007
Author: stephan
Date: 2007-03-18 13:10:50 +0000 (Sun, 18 Mar 2007)
New Revision: 25191
Removed:
squeeze/trunk/libsqueeze/archive-support-compr.c
squeeze/trunk/libsqueeze/archive-support-compr.h
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/archive-support-gnu-tar.h
squeeze/trunk/libsqueeze/archive-support-rar.c
squeeze/trunk/libsqueeze/archive-support-rar.h
squeeze/trunk/libsqueeze/archive-support-zip.c
squeeze/trunk/libsqueeze/archive-support-zip.h
squeeze/trunk/libsqueeze/libsqueeze-support.h
Modified:
squeeze/trunk/libsqueeze/archive-tempfs.c
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/libsqueeze/command-builder-compr.c
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/command-builder.c
squeeze/trunk/libsqueeze/command-builder.h
squeeze/trunk/libsqueeze/dbus-command.c
squeeze/trunk/libsqueeze/internals.c
squeeze/trunk/libsqueeze/internals.h
squeeze/trunk/libsqueeze/libsqueeze-module.h
squeeze/trunk/libsqueeze/libsqueeze.c
squeeze/trunk/libsqueeze/libsqueeze.h
squeeze/trunk/libsqueeze/macro-command.c
squeeze/trunk/libsqueeze/slist.c
squeeze/trunk/libsqueeze/spawn-command.c
Log:
Removed depricated support-objects
Fixed some header-declarations
Deleted: squeeze/trunk/libsqueeze/archive-support-compr.c
Deleted: squeeze/trunk/libsqueeze/archive-support-compr.h
Deleted: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
Deleted: squeeze/trunk/libsqueeze/archive-support-gnu-tar.h
Deleted: squeeze/trunk/libsqueeze/archive-support-rar.c
Deleted: squeeze/trunk/libsqueeze/archive-support-rar.h
Deleted: squeeze/trunk/libsqueeze/archive-support-zip.c
Deleted: squeeze/trunk/libsqueeze/archive-support-zip.h
Modified: squeeze/trunk/libsqueeze/archive-tempfs.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-tempfs.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/archive-tempfs.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -26,9 +26,7 @@
#include <errno.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-support.h"
-#include "libsqueeze-command.h"
+#include "libsqueeze-module.h"
#include "archive-iter.h"
#include "archive-command.h"
#include "archive.h"
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/archive.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -208,11 +208,13 @@
g_debug("%s\n", thunar_vfs_mime_info_get_name(archive->mime_info));
#endif
+ /*
if(!lsq_get_support_for_mimetype(thunar_vfs_mime_info_get_name(archive->mime_info)))
{
g_object_unref(archive);
archive = NULL;
}
+ */
return archive;
}
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/archive.h 2007-03-18 13:10:50 UTC (rev 25191)
@@ -37,6 +37,7 @@
guint64 n_files;
guint64 n_directories;
} props;
+ LSQCommandBuilder *cmd_builder;
gchar *temp_dir;
GSList *monitor_list;
LSQArchiveIterPool *pool;
Modified: squeeze/trunk/libsqueeze/command-builder-compr.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-compr.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/command-builder-compr.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,17 +24,7 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-command.h"
#include "libsqueeze-module.h"
-#include "archive-iter.h"
-#include "archive-tempfs.h"
-#include "archive.h"
-#include "archive-command.h"
-#include "macro-command.h"
-#include "spawn-command.h"
-#include "dbus-command.h"
-#include "command-builder.h"
#include "command-builder-compr.h"
static void
@@ -104,6 +94,12 @@
command_builder->build_extract = lsq_command_builder_compr_build_extract;
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[0] = "application/x-gzip";
+ command_builder->mime_types[1] = "application/x-bzip";
+ command_builder->mime_types[2] = "application/x-lzop";
+ command_builder->mime_types[3] = "application/x-compress";
}
/**
Modified: squeeze/trunk/libsqueeze/command-builder-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-gnu-tar.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/command-builder-gnu-tar.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,17 +24,7 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-command.h"
#include "libsqueeze-module.h"
-#include "archive-iter.h"
-#include "archive-tempfs.h"
-#include "archive.h"
-#include "archive-command.h"
-#include "macro-command.h"
-#include "spawn-command.h"
-#include "dbus-command.h"
-#include "command-builder.h"
#include "command-builder-gnu-tar.h"
#define LSQ_ARCHIVE_TEMP_FILE "gnu_tar_temp_file"
@@ -113,6 +103,14 @@
command_builder->build_extract = lsq_command_builder_gnu_tar_build_extract;
command_builder->build_remove = lsq_command_builder_gnu_tar_build_remove;
command_builder->build_refresh = lsq_command_builder_gnu_tar_build_refresh;
+
+ command_builder->mime_types = g_new0(gchar *, 7);
+ command_builder->mime_types[0] = "application/x-tar";
+ command_builder->mime_types[1] = "application/x-tarz";
+ command_builder->mime_types[2] = "application/x-compressed-tar";
+ command_builder->mime_types[3] = "application/x-bzip-compressed-tar";
+ command_builder->mime_types[4] = "application/x-bzip2-compressed-tar";
+ command_builder->mime_types[5] = "application/x-tzo";
}
/**
Modified: squeeze/trunk/libsqueeze/command-builder-rar.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-rar.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/command-builder-rar.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,17 +24,7 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-command.h"
#include "libsqueeze-module.h"
-#include "archive-iter.h"
-#include "archive-tempfs.h"
-#include "archive.h"
-#include "archive-command.h"
-#include "macro-command.h"
-#include "spawn-command.h"
-#include "dbus-command.h"
-#include "command-builder.h"
#include "command-builder-rar.h"
static void
@@ -104,6 +94,9 @@
command_builder->build_extract = lsq_command_builder_rar_build_extract;
command_builder->build_remove = lsq_command_builder_rar_build_remove;
command_builder->build_refresh = lsq_command_builder_rar_build_refresh;
+
+ command_builder->mime_types = g_new0(gchar *, 2);
+ command_builder->mime_types[0] = "application/x-rar";
}
/**
Modified: squeeze/trunk/libsqueeze/command-builder-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder-zip.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/command-builder-zip.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,19 +24,10 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-command.h"
#include "libsqueeze-module.h"
-#include "archive-iter.h"
-#include "archive-tempfs.h"
-#include "archive.h"
-#include "archive-command.h"
-#include "macro-command.h"
-#include "spawn-command.h"
-#include "dbus-command.h"
-#include "command-builder.h"
#include "command-builder-zip.h"
+
static void
lsq_command_builder_zip_class_init(LSQCommandBuilderZipClass *);
static void
@@ -107,6 +98,10 @@
command_builder->build_extract = lsq_command_builder_zip_build_extract;
command_builder->build_remove = lsq_command_builder_zip_build_remove;
command_builder->build_refresh = lsq_command_builder_zip_build_refresh;
+
+ command_builder->mime_types = g_new0(gchar *, 3);
+ command_builder->mime_types[0] = "application/zip";
+ command_builder->mime_types[1] = "application/x-zip";
}
/**
Modified: squeeze/trunk/libsqueeze/command-builder.c
===================================================================
--- squeeze/trunk/libsqueeze/command-builder.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/command-builder.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,8 +24,7 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-command.h"
+#include "libsqueeze-module.h"
#include "archive-iter.h"
#include "archive-tempfs.h"
#include "archive.h"
Modified: squeeze/trunk/libsqueeze/command-builder.h
===================================================================
--- squeeze/trunk/libsqueeze/command-builder.h 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/command-builder.h 2007-03-18 13:10:50 UTC (rev 25191)
@@ -27,10 +27,11 @@
{
GObject parent;
gchar *id;
+ gchar **mime_types;
LSQArchiveCommand *(*build_add) (LSQCommandBuilder *builder, LSQArchive *archive, GSList *files);
LSQArchiveCommand *(*build_extract)(LSQCommandBuilder *builder, LSQArchive *archive, const gchar *dest_path, GSList *files);
- LSQArchiveCommand *(*build_remove) (LSQCommandBuilder *builder, LSQArchive *archive, GSList *files);
+ LSQArchiveCommand *(*build_remove) (LSQCommandBuilder *builder, LSQArchive *archive, GSList *file_iters);
LSQArchiveCommand *(*build_refresh)(LSQCommandBuilder *builder, LSQArchive *archive);
LSQArchiveCommand *(*build_open) (LSQCommandBuilder *builder, LSQArchive *archive, GSList *files);
};
Modified: squeeze/trunk/libsqueeze/dbus-command.c
===================================================================
--- squeeze/trunk/libsqueeze/dbus-command.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/dbus-command.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,9 +24,6 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-support.h"
-#include "libsqueeze-command.h"
#include "libsqueeze-module.h"
#include "archive-iter.h"
#include "archive-command.h"
Modified: squeeze/trunk/libsqueeze/internals.c
===================================================================
--- squeeze/trunk/libsqueeze/internals.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/internals.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -21,7 +21,6 @@
#include <thunar-vfs/thunar-vfs.h>
#include "libsqueeze-archive.h"
-#include "libsqueeze-support.h"
#include "libsqueeze-view.h"
#include "libsqueeze-module.h"
#include "archive-iter.h"
Modified: squeeze/trunk/libsqueeze/internals.h
===================================================================
--- squeeze/trunk/libsqueeze/internals.h 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/internals.h 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,19 +24,10 @@
*
* general function for executing child-apps
*/
-gint
-lsq_execute(
- gchar *command,
- LSQArchive *archive,
- GChildWatchFunc function,
- GIOFunc f_in,
- GIOFunc f_out,
- GIOFunc f_err) G_GNUC_INTERNAL;
+ThunarVfsMimeDatabase *lsq_mime_database;
-LSQArchive *
-lsq_opened_archive_get_archive(gchar *path) G_GNUC_INTERNAL;
+gchar *
+lsq_concat_filenames(GSList *filenames);
-void
-lsq_archive_support_view_prepared(LSQArchive *archive, GSList *, gpointer user_data) G_GNUC_INTERNAL;
-
-ThunarVfsMimeDatabase *lsq_mime_database;
+LSQArchive *
+lsq_opened_archive_get_archive(gchar *path);
Modified: squeeze/trunk/libsqueeze/libsqueeze-module.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze-module.h 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/libsqueeze-module.h 2007-03-18 13:10:50 UTC (rev 25191)
@@ -17,63 +17,23 @@
#define __LIBSQUEEZE_MODULE_H__
#include <libsqueeze/libsqueeze-archive.h>
-#include <libsqueeze/libsqueeze-support.h>
#include <libsqueeze/libsqueeze-command.h>
+#include <libsqueeze/command-builder.h>
+#include <libsqueeze/archive-command.h>
+#include <libsqueeze/macro-command.h>
+#include <libsqueeze/spawn-command.h>
+#include <libsqueeze/dbus-command.h>
+#include <libsqueeze/internals.h>
G_BEGIN_DECLS
-struct _LSQArchiveSupport
-{
- GObject parent;
- gchar *id;
- GSList *mime;
- guint64 max_n_files;
-/*
- * The following functions should _NOT_ be called directly.
- *
- * lsq_archive_support_add()
- * lsq_archive_support_extract()
- * lsq_archive_support_remove()
- * lsq_archive_support_refresh()
- *
- * should be called instead.
- */
- gint (*add)(LSQArchiveSupport *support, LSQArchive *archive, GSList *files);
- gint (*extract)(LSQArchiveSupport *support, LSQArchive *archive, const gchar *dest_path, GSList *files);
- gint (*remove)(LSQArchiveSupport *support, LSQArchive *archive, GSList *files);
- gint (*refresh)(LSQArchiveSupport *support, LSQArchive *archive);
-};
-
-struct _LSQArchiveSupportClass
-{
- GObjectClass parent;
-};
-
-gchar *lsq_concat_filenames(GSList *filenames);
-gchar *lsq_concat_iter_filenames(GSList *file_iters);
-
-void lsq_archive_refreshed(const LSQArchive *archive);
-
-void lsq_archive_iter_set_prop_value(LSQArchiveIter *, guint, const GValue *);
-void lsq_archive_iter_set_prop(LSQArchiveIter *, guint, gconstpointer);
-void lsq_archive_iter_set_props(LSQArchiveIter *, ...);
-void lsq_archive_iter_set_propsv(LSQArchiveIter *, gconstpointer *);
-
LSQArchiveIter *lsq_archive_iter_add_file(LSQArchiveIter *, const gchar *);
-
LSQArchiveIter *lsq_archive_add_file(LSQArchive *, const gchar *);
-
-void lsq_archive_clear_entry_property_types(LSQArchive *);
-void lsq_archive_set_entry_property_type(LSQArchive *, guint, GType, const gchar *);
-void lsq_archive_set_entry_property_types(LSQArchive *, ...);
-void lsq_archive_set_entry_property_typesv(LSQArchive *, GType *, const gchar **);
-
+void lsq_archive_iter_set_propsv(LSQArchiveIter *, gconstpointer *);
gchar *lsq_archive_request_temp_file(LSQArchive *, const gchar*);
-void lsq_archive_support_add_mime(LSQArchiveSupport *support, gchar *mime);
-gboolean lsq_archive_support_mime_supported(LSQArchiveSupport *,const gchar *mime);
-gboolean lsq_register_support(LSQArchiveSupport *support);
+
G_END_DECLS
#endif /* __LIBSQUEEZE_MODULE_H__ */
Deleted: squeeze/trunk/libsqueeze/libsqueeze-support.h
Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/libsqueeze.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -27,10 +27,10 @@
#include "libsqueeze/archive-command.h"
#include "libsqueeze/archive.h"
#include "libsqueeze/command-builder.h"
-#include "libsqueeze/archive-support-zip.h"
-#include "libsqueeze/archive-support-rar.h"
-#include "libsqueeze/archive-support-compr.h"
-#include "libsqueeze/archive-support-gnu-tar.h"
+#include "libsqueeze/command-builder-zip.h"
+#include "libsqueeze/command-builder-rar.h"
+#include "libsqueeze/command-builder-compr.h"
+#include "libsqueeze/command-builder-gnu-tar.h"
#include "internals.h"
@@ -40,11 +40,11 @@
gchar *current_dir = g_get_current_dir();
lsq_mime_database = thunar_vfs_mime_database_get_default();
+
+/*
lsq_register_support(lsq_archive_support_zip_new());
lsq_register_support(lsq_archive_support_gnu_tar_new());
lsq_register_support(lsq_archive_support_compr_new());
-
-/*
lsq_register_support(lsq_archive_support_rar_new());
*/
@@ -119,29 +119,3 @@
g_object_unref(archive);
}
-/**
- * Some nice support functions should come for this
- *
- */
-GSList *
-lsq_get_supported_mime_types()
-{
- GSList *mime_types_list = NULL;
- LSQArchiveSupport *archive_support = NULL;
- GSList *supported_mime_types_list = NULL;
- GSList *archive_support_list = lsq_archive_support_list;
-
- while(archive_support_list)
- {
- archive_support = archive_support_list->data;
- supported_mime_types_list = archive_support->mime;
- while(supported_mime_types_list)
- {
- mime_types_list = g_slist_prepend(mime_types_list, supported_mime_types_list->data);
-
- supported_mime_types_list = g_slist_next(supported_mime_types_list);
- }
- archive_support_list = g_slist_next(archive_support_list);
- }
- return mime_types_list;
-}
Modified: squeeze/trunk/libsqueeze/libsqueeze.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.h 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/libsqueeze.h 2007-03-18 13:10:50 UTC (rev 25191)
@@ -18,7 +18,6 @@
#define __LIBSQUEEZE_H__
#include <libsqueeze/libsqueeze-archive.h>
-#include <libsqueeze/libsqueeze-support.h>
#include <libsqueeze/libsqueeze-view.h>
Modified: squeeze/trunk/libsqueeze/macro-command.c
===================================================================
--- squeeze/trunk/libsqueeze/macro-command.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/macro-command.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,9 +24,6 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-support.h"
-#include "libsqueeze-command.h"
#include "libsqueeze-module.h"
#include "archive-iter.h"
#include "archive-command.h"
Modified: squeeze/trunk/libsqueeze/slist.c
===================================================================
--- squeeze/trunk/libsqueeze/slist.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/slist.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -19,9 +19,7 @@
#include <glib-object.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-support.h"
-#include "libsqueeze-command.h"
+#include "libsqueeze-module.h"
#include "archive-iter.h"
#include "archive-command.h"
#include "archive.h"
Modified: squeeze/trunk/libsqueeze/spawn-command.c
===================================================================
--- squeeze/trunk/libsqueeze/spawn-command.c 2007-03-18 12:03:48 UTC (rev 25190)
+++ squeeze/trunk/libsqueeze/spawn-command.c 2007-03-18 13:10:50 UTC (rev 25191)
@@ -24,12 +24,11 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-command.h"
+#include "libsqueeze-module.h"
#include "archive-iter.h"
+#include "archive.h"
#include "archive-command.h"
#include "spawn-command.h"
-#include "archive.h"
static void
lsq_spawn_command_class_init(LSQSpawnCommandClass *);
More information about the Xfce4-commits
mailing list