Author: stephan
Date: 2007-02-14 15:42:48 +0000 (Wed, 14 Feb 2007)
New Revision: 24979
Added:
squeeze/trunk/libsqueeze/libsqueeze-support.h
squeeze/trunk/tests/Makefile.am
Modified:
squeeze/trunk/libsqueeze/Makefile.am
squeeze/trunk/libsqueeze/archive-command.c
squeeze/trunk/libsqueeze/archive-support-zip.c
squeeze/trunk/libsqueeze/archive-support.c
squeeze/trunk/libsqueeze/archive-support.h
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/internals.c
squeeze/trunk/libsqueeze/libsqueeze.h
squeeze/trunk/po/squeeze.pot
squeeze/trunk/tests/zip/test-zip-add.c
Log:
fix test-suite and make support opaque
Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am 2007-02-14 12:18:04 UTC (rev
24978)
+++ squeeze/trunk/libsqueeze/Makefile.am 2007-02-14 15:42:48 UTC (rev
24979)
@@ -4,6 +4,7 @@
internals.c internals.h \
libsqueeze.c libsqueeze.h \
libsqueeze-archive.h \
+ libsqueeze-support.h \
libsqueeze-view.h \
libsqueeze-module.h \
slist.c slist.h \
Modified: squeeze/trunk/libsqueeze/archive-command.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-command.c 2007-02-14 12:18:04 UTC (rev
24978)
+++ squeeze/trunk/libsqueeze/archive-command.c 2007-02-14 15:42:48 UTC (rev
24979)
@@ -102,7 +102,8 @@
lsq_archive_dequeue_command(archive_command->archive, archive_command);
LSQArchiveCommand *next_archive_command =
lsq_archive_get_front_command(archive_command->archive);
- lsq_archive_command_run(next_archive_command);
+ if(next_archive_command)
+ lsq_archive_command_run(next_archive_command);
}
/**
Modified: squeeze/trunk/libsqueeze/archive-support-zip.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-zip.c 2007-02-14 12:18:04 UTC
(rev 24978)
+++ squeeze/trunk/libsqueeze/archive-support-zip.c 2007-02-14 15:42:48 UTC
(rev 24979)
@@ -20,7 +20,7 @@
#include <glib-object.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
+#include "libsqueeze.h"
#include "libsqueeze-module.h"
#include "archive-iter.h"
#include "archive-command.h"
Modified: squeeze/trunk/libsqueeze/archive-support.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support.c 2007-02-14 12:18:04 UTC (rev
24978)
+++ squeeze/trunk/libsqueeze/archive-support.c 2007-02-14 15:42:48 UTC (rev
24979)
@@ -21,7 +21,7 @@
#include <glib-object.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
+#include "libsqueeze.h"
#include "archive-iter.h"
#include "archive-command.h"
#include "archive.h"
Modified: squeeze/trunk/libsqueeze/archive-support.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-support.h 2007-02-14 12:18:04 UTC (rev
24978)
+++ squeeze/trunk/libsqueeze/archive-support.h 2007-02-14 15:42:48 UTC (rev
24979)
@@ -41,7 +41,6 @@
typedef struct _LSQCustomAction LSQCustomAction;
typedef struct _LSQCustomActionCallback LSQCustomActionCallback;
-typedef struct _LSQArchiveSupport LSQArchiveSupport;
typedef gboolean (*LSQCustomActionPreFunc) (LSQCustomAction *);
@@ -106,19 +105,11 @@
GSList * lsq_get_registered_support_list();
gboolean lsq_register_support(LSQArchiveSupport *support);
-LSQArchiveSupport * lsq_get_support_for_mimetype(const gchar *mime_type);
-LSQArchiveSupport * lsq_get_support_for_mime_from_slist(GSList *list, const
gchar *mime);
const gchar * lsq_archive_support_get_id(LSQArchiveSupport *support);
gint lsq_archive_support_lookup_mime(gconstpointer
support_mime, gconstpointer mime);
gint lsq_archive_support_lookup_support(gconstpointer support,
gconstpointer mime);
-gint lsq_archive_support_add(LSQArchiveSupport *, LSQArchive
*, GSList *);
-gint lsq_archive_support_extract(LSQArchiveSupport *,
LSQArchive *, const gchar *, GSList *);
-gint lsq_archive_support_remove(LSQArchiveSupport *,
LSQArchive *, GSList *);
-gint lsq_archive_support_refresh(LSQArchiveSupport *,
LSQArchive *);
-gint lsq_archive_support_view(LSQArchiveSupport *, LSQArchive
*, GSList *);
-guint64 lsq_archive_support_get_max_n_files(LSQArchiveSupport *);
gboolean lsq_archive_support_can_stop(LSQArchiveSupport *support,
LSQArchive *archive);
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2007-02-14 12:18:04 UTC (rev 24978)
+++ squeeze/trunk/libsqueeze/archive.c 2007-02-14 15:42:48 UTC (rev 24979)
@@ -24,8 +24,7 @@
#include <sys/types.h>
#include <thunar-vfs/thunar-vfs.h>
-#include "libsqueeze-archive.h"
-#include "libsqueeze-view.h"
+#include "libsqueeze.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-02-14 12:18:04 UTC (rev
24978)
+++ squeeze/trunk/libsqueeze/internals.c 2007-02-14 15:42:48 UTC (rev
24979)
@@ -21,6 +21,7 @@
#include <thunar-vfs/thunar-vfs.h>
#include "libsqueeze-archive.h"
+#include "libsqueeze-support.h"
#include "archive-iter.h"
#include "archive-command.h"
#include "archive.h"
Added: squeeze/trunk/libsqueeze/libsqueeze-support.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze-support.h
(rev 0)
+++ squeeze/trunk/libsqueeze/libsqueeze-support.h 2007-02-14 15:42:48 UTC
(rev 24979)
@@ -0,0 +1,16 @@
+#ifndef __LIBSQUEEZE_SUPPORT_H__
+#define __LIBSQUEEZE_SUPPORT_H__
+
+typedef struct _LSQArchiveSupport LSQArchiveSupport;
+
+LSQArchiveSupport * lsq_get_support_for_mimetype(const gchar *mime_type);
+LSQArchiveSupport * lsq_get_support_for_mime_from_slist(GSList *list, const
gchar *mime);
+
+gint lsq_archive_support_add(LSQArchiveSupport *, LSQArchive
*, GSList *);
+gint lsq_archive_support_extract(LSQArchiveSupport *,
LSQArchive *, const gchar *, GSList *);
+gint lsq_archive_support_remove(LSQArchiveSupport *,
LSQArchive *, GSList *);
+gint lsq_archive_support_refresh(LSQArchiveSupport *,
LSQArchive *);
+gint lsq_archive_support_view(LSQArchiveSupport *, LSQArchive
*, GSList *);
+guint64 lsq_archive_support_get_max_n_files(LSQArchiveSupport *);
+
+#endif /* __LIBSQUEEZE_SUPPORT_H__ */
Modified: squeeze/trunk/libsqueeze/libsqueeze.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.h 2007-02-14 12:18:04 UTC (rev
24978)
+++ squeeze/trunk/libsqueeze/libsqueeze.h 2007-02-14 15:42:48 UTC (rev
24979)
@@ -18,6 +18,7 @@
#define __LIBSQUEEZE_H__
#include <libsqueeze/libsqueeze-archive.h>
+#include <libsqueeze/libsqueeze-support.h>
#include <libsqueeze/libsqueeze-view.h>
/* #include <libsqueeze/libsqueeze-module.h> */
Modified: squeeze/trunk/po/squeeze.pot
===================================================================
--- squeeze/trunk/po/squeeze.pot 2007-02-14 12:18:04 UTC (rev 24978)
+++ squeeze/trunk/po/squeeze.pot 2007-02-14 15:42:48 UTC (rev 24979)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2007-02-12 15:58+0100\n"
+"POT-Creation-Date: 2007-02-14 16:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -16,11 +16,11 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:318
+#: ../libsqueeze/archive.c:317
msgid "Name"
msgstr ""
-#: ../libsqueeze/archive.c:320
+#: ../libsqueeze/archive.c:319
msgid "Mime type"
msgstr ""
Added: squeeze/trunk/tests/Makefile.am
===================================================================
--- squeeze/trunk/tests/Makefile.am (rev 0)
+++ squeeze/trunk/tests/Makefile.am 2007-02-14 15:42:48 UTC (rev 24979)
@@ -0,0 +1 @@
+SUBDIRS = zip
Modified: squeeze/trunk/tests/zip/test-zip-add.c
===================================================================
--- squeeze/trunk/tests/zip/test-zip-add.c 2007-02-14 12:18:04 UTC (rev
24978)
+++ squeeze/trunk/tests/zip/test-zip-add.c 2007-02-14 15:42:48 UTC (rev
24979)
@@ -20,7 +20,7 @@
#include <thunar-vfs/thunar-vfs.h>
#include <libsqueeze/libsqueeze.h>
/* FIXME: HACK */
-#include <libsqueeze/archive-support.h>
+//#include <libsqueeze/archive-support.h>
int main()
{
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
