[Xfce4-commits] r24011 - in xarchiver/branches/xarchiver-psybsd: libsqueeze src
Stephan Arts
stephan at xfce.org
Thu Nov 30 12:35:40 CET 2006
Author: stephan
Date: 2006-11-30 11:35:40 +0000 (Thu, 30 Nov 2006)
New Revision: 24011
Added:
xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.c
xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.h
Removed:
xarchiver/branches/xarchiver-psybsd/libsqueeze/libxarchiver.c
xarchiver/branches/xarchiver-psybsd/libsqueeze/libxarchiver.h
Modified:
xarchiver/branches/xarchiver-psybsd/libsqueeze/Makefile.am
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-gnu-tar.h
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-rar.h
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-unrar.h
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.h
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h
xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.h
xarchiver/branches/xarchiver-psybsd/src/add_dialog.c
xarchiver/branches/xarchiver-psybsd/src/application.c
xarchiver/branches/xarchiver-psybsd/src/archive_store.c
xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c
xarchiver/branches/xarchiver-psybsd/src/main.c
xarchiver/branches/xarchiver-psybsd/src/main_window.c
xarchiver/branches/xarchiver-psybsd/src/navigation_bar.c
xarchiver/branches/xarchiver-psybsd/src/new_dialog.c
xarchiver/branches/xarchiver-psybsd/src/notebook.c
xarchiver/branches/xarchiver-psybsd/src/path_bar.c
xarchiver/branches/xarchiver-psybsd/src/preferences_dialog.c
xarchiver/branches/xarchiver-psybsd/src/tool_bar.c
xarchiver/branches/xarchiver-psybsd/src/widget_factory.c
Log:
Rename to Squeeze (step 2)
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/Makefile.am
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/Makefile.am 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/Makefile.am 2006-11-30 11:35:40 UTC (rev 24011)
@@ -2,7 +2,7 @@
libsqueeze_1_la_SOURCES = \
internals.c internals.h \
- libxarchiver.c libxarchiver.h \
+ libsqueeze.c libsqueeze.h \
mime.c mime.h \
slist.c slist.h \
archive.c archive.h \
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-gnu-tar.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-gnu-tar.h 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-gnu-tar.h 2006-11-30 11:35:40 UTC (rev 24011)
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __LIBXARCHIVER_ARCHIVE_SUPPORT_GNU_TAR_H__
-#define __LIBXARCHIVER_ARCHIVE_SUPPORT_GNU_TAR_H__
+#ifndef __LIBSQUEEZE_ARCHIVE_SUPPORT_GNU_TAR_H__
+#define __LIBSQUEEZE_ARCHIVE_SUPPORT_GNU_TAR_H__
G_BEGIN_DECLS
@@ -79,4 +79,4 @@
G_END_DECLS
-#endif /* __LIBXARCHIVER_ARCHIVE_SUPPORT_GNU_TAR_H__ */
+#endif /* __LIBSQUEEZE_ARCHIVE_SUPPORT_GNU_TAR_H__ */
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-rar.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-rar.h 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-rar.h 2006-11-30 11:35:40 UTC (rev 24011)
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __LIBXARCHIVER_ARCHIVE_SUPPORT_RAR_H__
-#define __LIBXARCHIVER_ARCHIVE_SUPPORT_RAR_H__
+#ifndef __LIBSQUEEZE_ARCHIVE_SUPPORT_RAR_H__
+#define __LIBSQUEEZE_ARCHIVE_SUPPORT_RAR_H__
G_BEGIN_DECLS
@@ -64,4 +64,4 @@
G_END_DECLS
-#endif /* __LIBXARCHIVER_ARCHIVE_SUPPORT_RAR_H__ */
+#endif /* __LIBSQUEEZE_ARCHIVE_SUPPORT_RAR_H__ */
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-unrar.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-unrar.h 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-unrar.h 2006-11-30 11:35:40 UTC (rev 24011)
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __LIBXARCHIVER_ARCHIVE_SUPPORT_UNRAR_H__
-#define __LIBXARCHIVER_ARCHIVE_SUPPORT_UNRAR_H__
+#ifndef __LIBSQUEEZE_ARCHIVE_SUPPORT_UNRAR_H__
+#define __LIBSQUEEZE_ARCHIVE_SUPPORT_UNRAR_H__
G_BEGIN_DECLS
@@ -63,4 +63,4 @@
G_END_DECLS
-#endif /* __LIBXARCHIVER_ARCHIVE_SUPPORT_UNRAR_H__ */
+#endif /* __LIBSQUEEZE_ARCHIVE_SUPPORT_UNRAR_H__ */
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.h 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support-zip.h 2006-11-30 11:35:40 UTC (rev 24011)
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __LIBXARCHIVER_ARCHIVE_SUPPORT_ZIP_H__
-#define __LIBXARCHIVER_ARCHIVE_SUPPORT_ZIP_H__
+#ifndef __LIBSQUEEZE_ARCHIVE_SUPPORT_ZIP_H__
+#define __LIBSQUEEZE_ARCHIVE_SUPPORT_ZIP_H__
G_BEGIN_DECLS
@@ -70,4 +70,4 @@
G_END_DECLS
-#endif /* __LIBXARCHIVER_ARCHIVE_SUPPORT_ZIP_H__ */
+#endif /* __LIBSQUEEZE_ARCHIVE_SUPPORT_ZIP_H__ */
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive-support.h 2006-11-30 11:35:40 UTC (rev 24011)
@@ -15,8 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __LIBXARCHIVER_ARCHIVE_SUPPORT_H__
-#define __LIBXARCHIVER_ARCHIVE_SUPPORT_H__
+#ifndef __LIBSQUEEZE_ARCHIVE_SUPPORT_H__
+#define __LIBSQUEEZE_ARCHIVE_SUPPORT_H__
G_BEGIN_DECLS
@@ -124,4 +124,4 @@
G_END_DECLS
-#endif /* __LIBXARCHIVER_ARCHIVE_SUPPORT_H__ */
+#endif /* __LIBSQUEEZE_ARCHIVE_SUPPORT_H__ */
Modified: xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.h 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/archive.h 2006-11-30 11:35:40 UTC (rev 24011)
@@ -15,8 +15,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __LIBXARCHIVER_ARCHIVE_H__
-#define __LIBXARCHIVER_ARCHIVE_H__
+#ifndef __LIBSQUEEZE_ARCHIVE_H__
+#define __LIBSQUEEZE_ARCHIVE_H__
G_BEGIN_DECLS
typedef enum
@@ -134,4 +134,4 @@
G_END_DECLS
-#endif /* __LIBXARCHIVER_ARCHIVE_H__ */
+#endif /* __LIBSQUEEZE_ARCHIVE_H__ */
Copied: xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.c (from rev 24010, xarchiver/branches/xarchiver-psybsd/libsqueeze/libxarchiver.c)
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.c (rev 0)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <psybsd at gmail.com>
+ *
+ * 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 <glib.h>
+#include <glib/gstdio.h>
+#include <glib-object.h>
+#include <gettext.h>
+
+#include "libsqueeze.h"
+#include "libsqueeze/archive-support-zip.h"
+#include "libsqueeze/archive-support-gnu-tar.h"
+
+#include "internals.h"
+
+void
+lsq_init()
+{
+ lsq_tmp_dir = g_get_tmp_dir();
+
+ lsq_mime_init();
+
+ lsq_register_support(lsq_archive_support_gnu_tar_new());
+ lsq_register_support(lsq_archive_support_zip_new());
+
+/*
+ TODO: Implement right commands in unrar
+ lsq_register_support(lsq_archive_support_rar_new());
+ lsq_register_support(lsq_archive_support_unrar_new());
+ */
+}
+
+void
+lsq_destroy()
+{
+ g_slist_foreach(lsq_archive_support_list, (GFunc)g_object_unref, NULL);
+
+ lsq_mime_destroy();
+}
+
+/*
+ * XAArchive* lsq_new_archive(gchar *path, LSQArchiveType type, gboolean overwrite)
+ *
+ */
+gint
+lsq_new_archive(gchar *path, gboolean overwrite, gchar *mime, LSQArchive **lp_archive)
+{
+ if(overwrite)
+ g_unlink(path);
+
+ if(g_file_test(path, G_FILE_TEST_EXISTS))
+ {
+ (*lp_archive) = NULL;
+ return 1;
+ }
+
+ LSQArchive *archive = lsq_archive_new(path, mime);
+ (*lp_archive) = archive;
+ if(!archive)
+ return 1;
+ return 0;
+}
+
+/*
+ *
+ * XAArchive* lsq_open_archive(gchar *path)
+ *
+ */
+gint
+lsq_open_archive(gchar *path, LSQArchive **lp_archive)
+{
+ if(!g_file_test(path, G_FILE_TEST_EXISTS))
+ {
+ (*lp_archive) = NULL;
+ return 1;
+ }
+
+ LSQArchive *archive = lsq_archive_new(path, NULL);
+ (*lp_archive) = archive;
+ if(!archive)
+ return 1;
+ return 0;
+}
+
+void
+lsq_close_archive(LSQArchive *archive)
+{
+ g_object_unref(archive);
+}
+
Copied: xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.h (from rev 24010, xarchiver/branches/xarchiver-psybsd/libsqueeze/libxarchiver.h)
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.h (rev 0)
+++ xarchiver/branches/xarchiver-psybsd/libsqueeze/libsqueeze.h 2006-11-30 11:35:40 UTC (rev 24011)
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <psybsd at gmail.com>
+ *
+ * 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_H__
+#define __LIBSQUEEZE_H__
+
+#define EXO_API_SUBJECT_TO_CHANGE
+
+#include <libsqueeze/mime.h>
+#include <libsqueeze/archive.h>
+#include <libsqueeze/archive-support.h>
+
+
+G_BEGIN_DECLS
+
+/*
+ * void
+ * lsq_init()
+ */
+void lsq_init();
+
+/*
+ * void
+ * lsq_destroy()
+ */
+void lsq_destroy();
+
+/*
+ * gint
+ * lsq_new_archive(gchar *path,
+ * LSQArchiveType type,
+ * gboolean overwrite,
+ * LSQArchive &&lp_archive)
+ *
+ * returns:
+ * 0 -- success
+ */
+gint
+lsq_new_archive( gchar *path,
+ gboolean overwrite,
+ gchar *mime,
+ LSQArchive **lp_archive);
+
+/*
+ * gint
+ * lsq_open_archive(gchar *path,
+ * LSQArchive **lp_archive)
+ *
+ * returns:
+ * 0 -- success
+ */
+gint
+lsq_open_archive( gchar *path,
+ LSQArchive **lp_archive);
+
+/*
+ * void
+ * lsq_close_archive( LSQArchive **lp_archive )
+ *
+ */
+void
+lsq_close_archive( LSQArchive *archive );
+
+gint
+lsq_stop_archive_child( LSQArchive *archive );
+
+void
+lsq_convert_mime_to_icon_name(GtkIconTheme *icon_theme, GValue *value);
+
+G_END_DECLS
+
+#endif /* __LIBSQUEEZE_H__ */
Deleted: xarchiver/branches/xarchiver-psybsd/libsqueeze/libxarchiver.c
Deleted: xarchiver/branches/xarchiver-psybsd/libsqueeze/libxarchiver.h
Modified: xarchiver/branches/xarchiver-psybsd/src/add_dialog.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/add_dialog.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/add_dialog.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -18,7 +18,7 @@
#include <config.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <gettext.h>
#include "add_dialog.h"
Modified: xarchiver/branches/xarchiver-psybsd/src/application.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/application.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/application.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -20,7 +20,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <gettext.h>
Modified: xarchiver/branches/xarchiver-psybsd/src/archive_store.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/archive_store.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/archive_store.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -21,7 +21,7 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <libsqueeze/mime.h>
#include <gettext.h>
@@ -43,6 +43,9 @@
static void
sq_archive_tree_sortable_init(GtkTreeSortableIface *ts_interface);
+static void
+sq_archive_store_finalize(GObject *object);
+
/* properties */
enum {
SQ_ARCHIVE_STORE_SHOW_ICONS = 1,
@@ -233,6 +236,7 @@
object_class->set_property = sq_archive_store_set_property;
object_class->get_property = sq_archive_store_get_property;
+ object_class->finalize = sq_archive_store_finalize;
pspec = g_param_spec_boolean("show_icons",
_("Show mime icons"),
@@ -1698,3 +1702,12 @@
{
archive_store->support = support;
}
+
+static void
+sq_archive_store_finalize(GObject *object)
+{
+ g_debug("%s", __FUNCTION__);
+ SQArchiveStore *store = SQ_ARCHIVE_STORE(object);
+ if(store->archive)
+ g_object_unref(store->archive);
+}
Modified: xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/extract_dialog.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -23,7 +23,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <gettext.h>
#include "extract_dialog.h"
Modified: xarchiver/branches/xarchiver-psybsd/src/main.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/main.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -20,7 +20,7 @@
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <gettext.h>
Modified: xarchiver/branches/xarchiver-psybsd/src/main_window.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/main_window.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -31,7 +31,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <libsqueeze/mime.h>
#include <gettext.h>
Modified: xarchiver/branches/xarchiver-psybsd/src/navigation_bar.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/navigation_bar.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/navigation_bar.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -20,7 +20,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include "archive_store.h"
#include "navigation_bar.h"
Modified: xarchiver/branches/xarchiver-psybsd/src/new_dialog.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/new_dialog.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/new_dialog.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -19,7 +19,7 @@
#include <config.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <gettext.h>
#include "new_dialog.h"
Modified: xarchiver/branches/xarchiver-psybsd/src/notebook.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/notebook.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/notebook.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -20,7 +20,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include "archive_store.h"
#include "navigation_bar.h"
#include "tool_bar.h"
@@ -320,7 +320,8 @@
LSQArchive *archive = sq_archive_store_get_archive(SQ_ARCHIVE_STORE(archive_store));
- g_signal_handlers_disconnect_by_func(archive, cb_notebook_archive_refreshed, treeview);
+ //if(archive)
+ //g_signal_handlers_disconnect_by_func(archive, cb_notebook_archive_refreshed, treeview);
g_object_unref(archive_store);
lsq_close_archive(archive);
Modified: xarchiver/branches/xarchiver-psybsd/src/path_bar.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/path_bar.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/path_bar.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -24,7 +24,7 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <gettext.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include "archive_store.h"
#include "navigation_bar.h"
#include "path_bar.h"
Modified: xarchiver/branches/xarchiver-psybsd/src/preferences_dialog.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/preferences_dialog.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/preferences_dialog.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -19,7 +19,7 @@
#include <config.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef HAVE_THUNAR_VFS
Modified: xarchiver/branches/xarchiver-psybsd/src/tool_bar.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/tool_bar.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/tool_bar.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -20,7 +20,7 @@
#include <string.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include <gettext.h>
#include "archive_store.h"
#include "navigation_bar.h"
Modified: xarchiver/branches/xarchiver-psybsd/src/widget_factory.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/widget_factory.c 2006-11-30 09:08:26 UTC (rev 24010)
+++ xarchiver/branches/xarchiver-psybsd/src/widget_factory.c 2006-11-30 11:35:40 UTC (rev 24011)
@@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <sys/types.h>
#include <gettext.h>
-#include <libsqueeze/libxarchiver.h>
+#include <libsqueeze/libsqueeze.h>
#include "widget_factory.h"
More information about the Xfce4-commits
mailing list