summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am3
-rw-r--r--configure.in.in10
-rw-r--r--po/POTFILES.in24
-rw-r--r--po/tumbler.pot22
-rw-r--r--tumbler/Makefile.am109
-rw-r--r--tumbler/tumbler-1.pc.in13
-rw-r--r--tumbler/tumbler-config.h.in72
-rw-r--r--tumbler/tumbler.h31
-rw-r--r--tumblerd/Makefile.am107
-rw-r--r--tumblerd/main.c (renamed from tumbler/main.c)10
-rw-r--r--tumblerd/org.xfce.Tumbler.service.in (renamed from tumbler/org.xfce.Tumbler.service.in)0
-rw-r--r--tumblerd/tumbler-builtin-thumbnailer.c (renamed from tumbler/tumbler-builtin-thumbnailer.c)4
-rw-r--r--tumblerd/tumbler-builtin-thumbnailer.h (renamed from tumbler/tumbler-builtin-thumbnailer.h)2
-rw-r--r--tumblerd/tumbler-builtin-thumbnailers.c (renamed from tumbler/tumbler-builtin-thumbnailers.c)4
-rw-r--r--tumblerd/tumbler-builtin-thumbnailers.h (renamed from tumbler/tumbler-builtin-thumbnailers.h)2
-rw-r--r--tumblerd/tumbler-manager-dbus.xml (renamed from tumbler/tumbler-manager-dbus.xml)0
-rw-r--r--tumblerd/tumbler-manager.c (renamed from tumbler/tumbler-manager.c)8
-rw-r--r--tumblerd/tumbler-manager.h (renamed from tumbler/tumbler-manager.h)2
-rw-r--r--tumblerd/tumbler-naive-scheduler.c (renamed from tumbler/tumbler-naive-scheduler.c)4
-rw-r--r--tumblerd/tumbler-naive-scheduler.h (renamed from tumbler/tumbler-naive-scheduler.h)2
-rw-r--r--tumblerd/tumbler-registry.c (renamed from tumbler/tumbler-registry.c)6
-rw-r--r--tumblerd/tumbler-registry.h (renamed from tumbler/tumbler-registry.h)2
-rw-r--r--tumblerd/tumbler-scheduler.c (renamed from tumbler/tumbler-scheduler.c)5
-rw-r--r--tumblerd/tumbler-scheduler.h (renamed from tumbler/tumbler-scheduler.h)2
-rw-r--r--tumblerd/tumbler-service-dbus.xml (renamed from tumbler/tumbler-service-dbus.xml)0
-rw-r--r--tumblerd/tumbler-service.c (renamed from tumbler/tumbler-service.c)13
-rw-r--r--tumblerd/tumbler-service.h (renamed from tumbler/tumbler-service.h)2
-rw-r--r--tumblerd/tumbler-specialized-thumbnailer.c (renamed from tumbler/tumbler-specialized-thumbnailer.c)4
-rw-r--r--tumblerd/tumbler-specialized-thumbnailer.h (renamed from tumbler/tumbler-specialized-thumbnailer.h)2
-rw-r--r--tumblerd/tumbler-threshold-scheduler.c (renamed from tumbler/tumbler-threshold-scheduler.c)4
-rw-r--r--tumblerd/tumbler-threshold-scheduler.h (renamed from tumbler/tumbler-threshold-scheduler.h)2
-rw-r--r--tumblerd/tumbler-thumbnailer.c (renamed from tumbler/tumbler-thumbnailer.c)5
-rw-r--r--tumblerd/tumbler-thumbnailer.h (renamed from tumbler/tumbler-thumbnailer.h)0
-rw-r--r--tumblerd/tumbler-utils.h (renamed from tumbler/tumbler-utils.h)0
34 files changed, 361 insertions, 115 deletions
diff --git a/Makefile.am b/Makefile.am
index a785791..7358be8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,5 @@
SUBDIRS = \
po \
- tumbler
+ tumbler \
+ tumblerd
diff --git a/configure.in.in b/configure.in.in
index 6fb990a..ea81235 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -21,8 +21,9 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
m4_define([tumbler_verinfo], [0:0:0]) dnl TODO: Do we need to change this for the first release?
+m4_define([tumbler_version_api_major], [1])
m4_define([tumbler_version_major], [0])
-m4_define([tumbler_version_minor], [1])
+m4_define([tumbler_version_minor], [0])
m4_define([tumbler_version_micro], [0])
m4_define([tumbler_version_build], [r@REVISION@])
m4_define([tumbler_version_tag], [svn])
@@ -61,10 +62,12 @@ dnl ****************************
TUMBLER_VERSION_MAJOR=tumbler_version_major()
TUMBLER_VERSION_MINOR=tumbler_version_minor()
TUMBLER_VERSION_MICRO=tumbler_version_micro()
-TUMBLER_VERSION_API=$TUMBLER_VERSION_MAJOR.$TUMBLER_VERSION_MINOR
+TUMBLER_VERSION_API_MAJOR=tumbler_version_api_major()
+TUMBLER_VERSION_API=$TUMBLER_VERSION_API_MAJOR
AC_SUBST([TUMBLER_VERSION_MAJOR])
AC_SUBST([TUMBLER_VERSION_MINOR])
AC_SUBST([TUMBLER_VERSION_MICRO])
+AC_SUBST([TUMBLER_VERSION_API_MAJOR])
AC_SUBST([TUMBLER_VERSION_API])
dnl *******************************
@@ -214,6 +217,9 @@ AC_OUTPUT([
Makefile
po/Makefile.in
tumbler/Makefile
+tumbler/tumbler-config.h
+tumbler/tumbler-$TUMBLER_VERSION_API.pc
+tumblerd/Makefile
])
dnl ***************************
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 45c7f9a..5ea9d84 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1,23 @@
-tumbler/main.c
+tumblerd/main.c
+tumblerd/stamp-tumbler-marshal.h
+tumblerd/tumbler-builtin-thumbnailer.c
+tumblerd/tumbler-builtin-thumbnailer.h
+tumblerd/tumbler-builtin-thumbnailers.c
+tumblerd/tumbler-builtin-thumbnailers.h
+tumblerd/tumbler-manager.c
+tumblerd/tumbler-manager.h
+tumblerd/tumbler-naive-scheduler.c
+tumblerd/tumbler-naive-scheduler.h
+tumblerd/tumbler-registry.c
+tumblerd/tumbler-registry.h
+tumblerd/tumbler-scheduler.c
+tumblerd/tumbler-scheduler.h
+tumblerd/tumbler-service.c
+tumblerd/tumbler-service.h
+tumblerd/tumbler-specialized-thumbnailer.c
+tumblerd/tumbler-specialized-thumbnailer.h
+tumblerd/tumbler-threshold-scheduler.c
+tumblerd/tumbler-threshold-scheduler.h
+tumblerd/tumbler-thumbnailer.c
+tumblerd/tumbler-thumbnailer.h
+tumblerd/tumbler-utils.h
diff --git a/po/tumbler.pot b/po/tumbler.pot
index bcb862d..1237153 100644
--- a/po/tumbler.pot
+++ b/po/tumbler.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-18 05:04+0200\n"
+"POT-Creation-Date: 2009-05-21 13:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,36 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. set the application name. Translators: Don't translate "Tumbler".
-#: ../tumbler/main.c:57
+#: ../tumblerd/main.c:57
msgid "Tumbler Thumbnailing Service"
msgstr ""
-#: ../tumbler/main.c:72
+#: ../tumblerd/main.c:72
#, c-format
msgid "Failed to connect to the D-Bus session bus: %s"
msgstr ""
-#: ../tumbler/main.c:89
+#: ../tumblerd/main.c:91
#, c-format
msgid "Failed to load specialized thumbnailers into the registry: %s"
msgstr ""
-#: ../tumbler/main.c:106
+#: ../tumblerd/main.c:108
#, c-format
msgid "Failed to start the thumbnailer manager: %s"
msgstr ""
-#: ../tumbler/main.c:123
+#: ../tumblerd/main.c:125
#, c-format
msgid "Failed to start the thumbnailer service: %s"
msgstr ""
+
+#: ../tumblerd/tumbler-manager.c:280
+#, c-format
+msgid "Another thumbnailer manager is already running"
+msgstr ""
+
+#: ../tumblerd/tumbler-service.c:411
+#, c-format
+msgid "Another generic thumbnailer is already running"
+msgstr ""
diff --git a/tumbler/Makefile.am b/tumbler/Makefile.am
index d733d95..fe16a87 100644
--- a/tumbler/Makefile.am
+++ b/tumbler/Makefile.am
@@ -17,82 +17,69 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-libexec_PROGRAMS = \
- tumbler
-
-tumbler_built_sources = \
- tumbler-manager-dbus-bindings.h \
- tumbler-marshal.c \
- tumbler-marshal.h \
- tumbler-service-dbus-bindings.h
-
-tumbler_SOURCES = \
- main.c \
- tumbler-builtin-thumbnailers.c \
- tumbler-builtin-thumbnailers.h \
- tumbler-builtin-thumbnailer.c \
- tumbler-builtin-thumbnailer.h \
- tumbler-manager.c \
- tumbler-manager.h \
- tumbler-naive-scheduler.c \
- tumbler-naive-scheduler.h \
- tumbler-registry.c \
- tumbler-registry.h \
- tumbler-scheduler.c \
- tumbler-scheduler.h \
- tumbler-service.c \
- tumbler-service.h \
- tumbler-specialized-thumbnailer.c \
- tumbler-specialized-thumbnailer.h \
- tumbler-threshold-scheduler.c \
- tumbler-threshold-scheduler.h \
- tumbler-thumbnailer.c \
- tumbler-thumbnailer.h \
- tumbler-utils.h \
- $(tumbler_built_sources)
+lib_LTLIBRARIES = \
+ libtumbler-1.la
+
+libtumbler_built_public_sources = \
+ tumbler-marshal.h
+
+libtumbler_built_sources = \
+ $(libtumbler_built_public_sources) \
+ tumbler-marshal.c
+
+libtumbler_headers = \
+ tumbler-config.h \
+ tumbler-marshal.h
+
+libtumbler_sources = \
+ tumbler-config.c \
+ tumbler-marshal.c
+
+libtumblerincludedir = $(includedir)/tumbler-$(TUMBLER_VERSION_API)/tumbler
+
+libtumblerinclude_HEADERS = \
+ $(libtumbler_headers)
+
+libtumbler_1_la_SOURCES = \
+ $(libtumbler_sources) \
+ $(libtumbler_headers)
-tumbler_CFLAGS = \
+libtumbler_1_la_CFLAGS = \
+ -DDATADIR=\"$(datadir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DG_LOG_DOMAIN=\"tumbler\" \
+ -DTUMBLER_COMPILATION \
+ -DTUMBLER_VERSION_API=\"$(TUMBLER_VERSION_API)\" \
-I$(top_srcdir) \
- $(DBUS_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(GDK_PIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTHREAD_CFLAGS)
+ $(GTHREAD_CFLAGS) \
+ $(PLATFORM_CFLAGS)
-tumbler_LDFLAGS = \
- -no-undefined
+libtumbler_1_la_LDFLAGS = \
+ -no-undefined \
+ -export-dynamic \
+ -version-info $(TUMBLER_VERINFO) \
+ $(PLATFORM_LDFLAGS)
-tumbler_LDADD = \
- $(DBUS_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(GDK_PIXBUF_LIBS) \
+libtumbler_1_la_LIBADD = \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(GTHREAD_LIBS)
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.xfce.Tumbler.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-%.service: %.service.in
- sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
-
-CLEANFILES = \
- $(service_DATA)
-
EXTRA_DIST = \
- $(service_in_files) \
- tumbler-manager-dbus.xml \
- tumbler-service-dbus.xml
+ tumbler-config.h.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tumbler-1.pc
if MAINTAINER_MODE
DISTCLEANFILES = \
stamp-tumbler-marshal.h \
- $(tumbler_built_sources)
+ tumbler-1.pc \
+ tumbler-config.h \
+ $(libtumbler_built_sources)
BUILT_SOURCES = \
$(tumbler_built_sources)
@@ -115,10 +102,4 @@ tumbler-marshal.c: tumbler-marshal.list Makefile
&& cp xgen-emc tumbler-marshal.c \
&& rm -f xgen-emc
-tumbler-manager-dbus-bindings.h: tumbler-manager-dbus.xml Makefile
- dbus-binding-tool --mode=glib-server --prefix=tumbler_manager $< > $@
-
-tumbler-service-dbus-bindings.h: tumbler-service-dbus.xml Makefile
- dbus-binding-tool --mode=glib-server --prefix=tumbler_service $< > $@
-
endif
diff --git a/tumbler/tumbler-1.pc.in b/tumbler/tumbler-1.pc.in
new file mode 100644
index 0000000..73712bc
--- /dev/null
+++ b/tumbler/tumbler-1.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+tumbler_api_version=@TUMBLER_VERSION_API@
+
+Name: @PACKAGE_TARNAME@
+Description: Supporting library for tumbler
+Requires: glib-2.0 gio-2.0 gthread-2.0 gobject-2.0
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -ltumbler-${tumbler_api_version}
+Cflags: -I${includedir}/tumbler-${tumbler_api_version}
diff --git a/tumbler/tumbler-config.h.in b/tumbler/tumbler-config.h.in
new file mode 100644
index 0000000..5460fc1
--- /dev/null
+++ b/tumbler/tumbler-config.h.in
@@ -0,0 +1,72 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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 Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if !defined (TUMBLER_INSIDE_TUMBLER_H) && !defined (TUMBLER_COMPILATION)
+#error "Only <tumbler/tumbler.h> may be included directly. This file might disappear or change contents."
+#endif
+
+#ifndef __TUMBLER_CONFIG_H__
+#define __TUMBLER_CONFIG_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define TUMBLER_MAJOR_VERSION @TUMBLER_VERSION_MAJOR@
+#define TUMBLER_MINOR_VERSION @TUMBLER_VERSION_MINOR@
+#define TUMBLER_MICRO_VERSION @TUMBLER_VERSION_MICRO@
+
+#define TUMBLER_CHECK_VERSION(major,minor,micro) \
+ (TUMBLER_MAJOR_VERSION > (major) \
+ || (TUMBLER_MAJOR_VERSION == (major) \
+ && TUMBLER_MINOR_VERSION > (minor)) \
+ || (TUMBLER_MAJOR_VERSION == (major) \
+ && TUMBLER_MINOR_VERSION == (minor) \
+ && TUMBLER_MICRO_VERSION >= (micro)))
+
+extern const guint tumbler_major_version;
+extern const guint tumbler_minor_version;
+extern const guint tumbler_micro_version;
+
+const gchar *tumbler_check_version (guint required_major,
+ guint required_minor,
+ guint required_micro);
+
+/* verify that G_GNUC_NULL_TERMINATED is defined */
+#if !defined(G_GNUC_NULL_TERMINATED)
+#if __GNUC__ >= 4
+#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+#else
+#define G_GNUC_NULL_TERMINATED
+#endif /* __GNUC__ */
+#endif /* !defined(G_GNUC_NULL_TERMINATED) */
+
+/* verify that G_GNUC_WARN_UNUSED_RESULT is defined */
+#if !defined(G_GNUC_WARN_UNUSED_RESULT)
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#define G_GNUC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#else
+#define G_GNUC_WARN_UNUSED_RESULT
+#endif /* __GNUC__ */
+#endif /* !defined(G_GNUC_WARN_UNUSED_RESULT) */
+
+G_END_DECLS
+
+#endif /* !__TUMBLER_CONFIG_H__ */
diff --git a/tumbler/tumbler.h b/tumbler/tumbler.h
new file mode 100644
index 0000000..7247342
--- /dev/null
+++ b/tumbler/tumbler.h
@@ -0,0 +1,31 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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 Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __TUMBLER_H__
+#define __TUMBLER_H__
+
+#define TUMBLER_INSIDE_TUMBLER_H
+
+#include <tumbler/tumbler-config.h>
+#include <tumbler/tumbler-marshal.h>
+
+#undef TUMBLER_INSIDE_TUMBLER_H
+
+#endif /* !__TUMBLER_H__ */
diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
new file mode 100644
index 0000000..3c248a8
--- /dev/null
+++ b/tumblerd/Makefile.am
@@ -0,0 +1,107 @@
+# vi:set ts=8 sw=8 noet ai nocindent:
+#-
+# Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
+#
+# 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 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., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+libexec_PROGRAMS = \
+ tumblerd
+
+tumblerd_built_sources = \
+ tumbler-manager-dbus-bindings.h \
+ tumbler-service-dbus-bindings.h
+
+tumblerd_SOURCES = \
+ main.c \
+ tumbler-builtin-thumbnailers.c \
+ tumbler-builtin-thumbnailers.h \
+ tumbler-builtin-thumbnailer.c \
+ tumbler-builtin-thumbnailer.h \
+ tumbler-manager.c \
+ tumbler-manager.h \
+ tumbler-naive-scheduler.c \
+ tumbler-naive-scheduler.h \
+ tumbler-registry.c \
+ tumbler-registry.h \
+ tumbler-scheduler.c \
+ tumbler-scheduler.h \
+ tumbler-service.c \
+ tumbler-service.h \
+ tumbler-specialized-thumbnailer.c \
+ tumbler-specialized-thumbnailer.h \
+ tumbler-threshold-scheduler.c \
+ tumbler-threshold-scheduler.h \
+ tumbler-thumbnailer.c \
+ tumbler-thumbnailer.h \
+ tumbler-utils.h \
+ $(tumbler_built_sources)
+
+tumblerd_CFLAGS = \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"tumblerd\" \
+ -I$(top_srcdir) \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(GDK_PIXBUF_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GTHREAD_CFLAGS)
+
+tumblerd_LDFLAGS = \
+ -no-undefined
+
+tumblerd_DEPENDENCIES = \
+ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
+tumblerd_LDADD = \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(GDK_PIXBUF_LIBS) \
+ $(GIO_LIBS) \
+ $(GLIB_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
+
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.xfce.Tumbler.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+%.service: %.service.in
+ sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+
+CLEANFILES = \
+ $(service_DATA)
+
+EXTRA_DIST = \
+ $(service_in_files) \
+ tumbler-manager-dbus.xml \
+ tumbler-service-dbus.xml
+
+if MAINTAINER_MODE
+
+DISTCLEANFILES = \
+ $(tumblerd_built_sources)
+
+BUILT_SOURCES = \
+ $(tumblerd_built_sources)
+
+tumbler-manager-dbus-bindings.h: tumbler-manager-dbus.xml Makefile
+ dbus-binding-tool --mode=glib-server --prefix=tumbler_manager $< > $@
+
+tumbler-service-dbus-bindings.h: tumbler-service-dbus.xml Makefile
+ dbus-binding-tool --mode=glib-server --prefix=tumbler_service $< > $@
+
+endif
diff --git a/tumbler/main.c b/tumblerd/main.c
index d7050fd..1b24363 100644
--- a/tumbler/main.c
+++ b/tumblerd/main.c
@@ -30,11 +30,11 @@
#include <dbus/dbus-glib.h>
-#include <tumbler/tumbler-builtin-thumbnailers.h>
-#include <tumbler/tumbler-manager.h>
-#include <tumbler/tumbler-registry.h>
-#include <tumbler/tumbler-service.h>
-#include <tumbler/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-builtin-thumbnailers.h>
+#include <tumblerd/tumbler-manager.h>
+#include <tumblerd/tumbler-registry.h>
+#include <tumblerd/tumbler-service.h>
+#include <tumblerd/tumbler-thumbnailer.h>
diff --git a/tumbler/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.Tumbler.service.in
index 313a999..313a999 100644
--- a/tumbler/org.xfce.Tumbler.service.in
+++ b/tumblerd/org.xfce.Tumbler.service.in
diff --git a/tumbler/tumbler-builtin-thumbnailer.c b/tumblerd/tumbler-builtin-thumbnailer.c
index 0e4b4d5..d68be28 100644
--- a/tumbler/tumbler-builtin-thumbnailer.c
+++ b/tumblerd/tumbler-builtin-thumbnailer.c
@@ -25,8 +25,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <tumbler/tumbler-thumbnailer.h>
-#include <tumbler/tumbler-builtin-thumbnailer.h>
+#include <tumblerd/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-builtin-thumbnailer.h>
diff --git a/tumbler/tumbler-builtin-thumbnailer.h b/tumblerd/tumbler-builtin-thumbnailer.h
index de8f538..ca626f1 100644
--- a/tumbler/tumbler-builtin-thumbnailer.h
+++ b/tumblerd/tumbler-builtin-thumbnailer.h
@@ -21,7 +21,7 @@
#ifndef __TUMBLER_BUILTIN_THUMBNAILER_H__
#define __TUMBLER_BUILTIN_THUMBNAILER_H__
-#include <tumbler/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-thumbnailer.h>
G_BEGIN_DECLS
diff --git a/tumbler/tumbler-builtin-thumbnailers.c b/tumblerd/tumbler-builtin-thumbnailers.c
index 6b1c90b..9567a72 100644
--- a/tumbler/tumbler-builtin-thumbnailers.c
+++ b/tumblerd/tumbler-builtin-thumbnailers.c
@@ -26,8 +26,8 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#endif
-#include <tumbler/tumbler-builtin-thumbnailer.h>
-#include <tumbler/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-builtin-thumbnailer.h>
+#include <tumblerd/tumbler-thumbnailer.h>
diff --git a/tumbler/tumbler-builtin-thumbnailers.h b/tumblerd/tumbler-builtin-thumbnailers.h
index 4b145f9..1555fe9 100644
--- a/tumbler/tumbler-builtin-thumbnailers.h
+++ b/tumblerd/tumbler-builtin-thumbnailers.h
@@ -21,7 +21,7 @@
#ifndef __TUMBLER_BUILTIN_THUMBNAILERS_H__
#define __TUMBLER_BUILTIN_THUMBNAILERS_H__
-#include <tumbler/tumbler-builtin-thumbnailer.h>
+#include <tumblerd/tumbler-builtin-thumbnailer.h>
G_BEGIN_DECLS
diff --git a/tumbler/tumbler-manager-dbus.xml b/tumblerd/tumbler-manager-dbus.xml
index fedfe83..fedfe83 100644
--- a/tumbler/tumbler-manager-dbus.xml
+++ b/tumblerd/tumbler-manager-dbus.xml
diff --git a/tumbler/tumbler-manager.c b/tumblerd/tumbler-manager.c
index 9ce8ff8..2f03b6c 100644
--- a/tumbler/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -30,10 +30,10 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <tumbler/tumbler-manager.h>
-#include <tumbler/tumbler-manager-dbus-bindings.h>
-#include <tumbler/tumbler-specialized-thumbnailer.h>
-#include <tumbler/tumbler-utils.h>
+#include <tumblerd/tumbler-manager.h>
+#include <tumblerd/tumbler-manager-dbus-bindings.h>
+#include <tumblerd/tumbler-specialized-thumbnailer.h>
+#include <tumblerd/tumbler-utils.h>
diff --git a/tumbler/tumbler-manager.h b/tumblerd/tumbler-manager.h
index 7880854..27a2810 100644
--- a/tumbler/tumbler-manager.h
+++ b/tumblerd/tumbler-manager.h
@@ -23,7 +23,7 @@
#include <dbus/dbus-glib.h>
-#include <tumbler/tumbler-registry.h>
+#include <tumblerd/tumbler-registry.h>
G_BEGIN_DECLS;
diff --git a/tumbler/tumbler-naive-scheduler.c b/tumblerd/tumbler-naive-scheduler.c
index 1f57c12..b19b906 100644
--- a/tumbler/tumbler-naive-scheduler.c
+++ b/tumblerd/tumbler-naive-scheduler.c
@@ -25,8 +25,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <tumbler/tumbler-naive-scheduler.h>
-#include <tumbler/tumbler-scheduler.h>
+#include <tumblerd/tumbler-naive-scheduler.h>
+#include <tumblerd/tumbler-scheduler.h>
diff --git a/tumbler/tumbler-naive-scheduler.h b/tumblerd/tumbler-naive-scheduler.h
index 1e2e37f..d6520f1 100644
--- a/tumbler/tumbler-naive-scheduler.h
+++ b/tumblerd/tumbler-naive-scheduler.h
@@ -21,7 +21,7 @@
#ifndef __TUMBLER_NAIVE_SCHEDULER_H__
#define __TUMBLER_NAIVE_SCHEDULER_H__
-#include <tumbler/tumbler-scheduler.h>
+#include <tumblerd/tumbler-scheduler.h>
G_BEGIN_DECLS;
diff --git a/tumbler/tumbler-registry.c b/tumblerd/tumbler-registry.c
index 4ee3a27..1eda9c7 100644
--- a/tumbler/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -25,9 +25,9 @@
#include <glib.h>
#include <glib-object.h>
-#include <tumbler/tumbler-builtin-thumbnailer.h>
-#include <tumbler/tumbler-registry.h>
-#include <tumbler/tumbler-specialized-thumbnailer.h>
+#include <tumblerd/tumbler-builtin-thumbnailer.h>
+#include <tumblerd/tumbler-registry.h>
+#include <tumblerd/tumbler-specialized-thumbnailer.h>
diff --git a/tumbler/tumbler-registry.h b/tumblerd/tumbler-registry.h
index 7b1fe62..f8f1515 100644
--- a/tumbler/tumbler-registry.h
+++ b/tumblerd/tumbler-registry.h
@@ -21,7 +21,7 @@
#ifndef __TUMBLER_REGISTRY_H__
#define __TUMBLER_REGISTRY_H__
-#include <tumbler/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-thumbnailer.h>
G_BEGIN_DECLS
diff --git a/tumbler/tumbler-scheduler.c b/tumblerd/tumbler-scheduler.c
index d428a41..fc6e1db 100644
--- a/tumbler/tumbler-scheduler.c
+++ b/tumblerd/tumbler-scheduler.c
@@ -22,8 +22,9 @@
#include <config.h>
#endif
-#include <tumbler/tumbler-marshal.h>
-#include <tumbler/tumbler-scheduler.h>
+#include <tumbler/tumbler.h>
+
+#include <tumblerd/tumbler-scheduler.h>
diff --git a/tumbler/tumbler-scheduler.h b/tumblerd/tumbler-scheduler.h
index e1a56b5..f71ab05 100644
--- a/tumbler/tumbler-scheduler.h
+++ b/tumblerd/tumbler-scheduler.h
@@ -21,7 +21,7 @@
#ifndef __TUMBLER_SCHEDULER_H__
#define __TUMBLER_SCHEDULER_H__
-#include <tumbler/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-thumbnailer.h>
G_BEGIN_DECLS
diff --git a/tumbler/tumbler-service-dbus.xml b/tumblerd/tumbler-service-dbus.xml
index a3d26f3..a3d26f3 100644
--- a/tumbler/tumbler-service-dbus.xml
+++ b/tumblerd/tumbler-service-dbus.xml
diff --git a/tumbler/tumbler-service.c b/tumblerd/tumbler-service.c
index a9f5213..eaca835 100644
--- a/tumbler/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -30,12 +30,13 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <tumbler/tumbler-marshal.h>
-#include <tumbler/tumbler-naive-scheduler.h>
-#include <tumbler/tumbler-scheduler.h>
-#include <tumbler/tumbler-service.h>
-#include <tumbler/tumbler-service-dbus-bindings.h>
-#include <tumbler/tumbler-utils.h>
+#include <tumbler/tumbler.h>
+
+#include <tumblerd/tumbler-naive-scheduler.h>
+#include <tumblerd/tumbler-scheduler.h>
+#include <tumblerd/tumbler-service.h>
+#include <tumblerd/tumbler-service-dbus-bindings.h>
+#include <tumblerd/tumbler-utils.h>
diff --git a/tumbler/tumbler-service.h b/tumblerd/tumbler-service.h
index f3f339d..4b2fb9a 100644
--- a/tumbler/tumbler-service.h
+++ b/tumblerd/tumbler-service.h
@@ -23,7 +23,7 @@
#include <dbus/dbus-glib.h>
-#include <tumbler/tumbler-registry.h>
+#include <tumblerd/tumbler-registry.h>
G_BEGIN_DECLS;
diff --git a/tumbler/tumbler-specialized-thumbnailer.c b/tumblerd/tumbler-specialized-thumbnailer.c
index f18a30e..619b796 100644
--- a/tumbler/tumbler-specialized-thumbnailer.c
+++ b/tumblerd/tumbler-specialized-thumbnailer.c
@@ -25,8 +25,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <tumbler/tumbler-thumbnailer.h>
-#include <tumbler/tumbler-specialized-thumbnailer.h>
+#include <tumblerd/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-specialized-thumbnailer.h>
diff --git a/tumbler/tumbler-specialized-thumbnailer.h b/tumblerd/tumbler-specialized-thumbnailer.h
index 3ec63b3..35d47e0 100644
--- a/tumbler/tumbler-specialized-thumbnailer.h
+++ b/tumblerd/tumbler-specialized-thumbnailer.h
@@ -23,7 +23,7 @@
#include <dbus/dbus-glib-lowlevel.h>
-#include <tumbler/tumbler-thumbnailer.h>
+#include <tumblerd/tumbler-thumbnailer.h>
G_BEGIN_DECLS
diff --git a/tumbler/tumbler-threshold-scheduler.c b/tumblerd/tumbler-threshold-scheduler.c
index e46d582..bc0e917 100644
--- a/tumbler/tumbler-threshold-scheduler.c
+++ b/tumblerd/tumbler-threshold-scheduler.c
@@ -25,8 +25,8 @@
#include <glib.h>
#include <glib-object.h>
-#include <tumbler/tumbler-threshold-scheduler.h>
-#include <tumbler/tumbler-scheduler.h>
+#include <tumblerd/tumbler-threshold-scheduler.h>
+#include <tumblerd/tumbler-scheduler.h>
diff --git a/tumbler/tumbler-threshold-scheduler.h b/tumblerd/tumbler-threshold-scheduler.h
index 3808915..82097e1 100644
--- a/tumbler/tumbler-threshold-scheduler.h
+++ b/tumblerd/tumbler-threshold-scheduler.h
@@ -21,7 +21,7 @@
#ifndef __TUMBLER_THRESHOLD_SCHEDULER_H__
#define __TUMBLER_THRESHOLD_SCHEDULER_H__
-#include <tumbler/tumbler-scheduler.h>
+#include <tumblerd/tumbler-scheduler.h>
G_BEGIN_DECLS;
diff --git a/tumbler/tumbler-thumbnailer.c b/tumblerd/tumbler-thumbnailer.c
index d3d39eb..f8dcdd8 100644
--- a/tumbler/tumbler-thumbnailer.c
+++ b/tumblerd/tumbler-thumbnailer.c
@@ -22,8 +22,9 @@
#include <config.h>
#endif
-#include <tumbler/tumbler-marshal.h>
-#include <tumbler/tumbler-thumbnailer.h>
+#include <tumbler/tumbler.h>
+
+#include <tumblerd/tumbler-thumbnailer.h>
diff --git a/tumbler/tumbler-thumbnailer.h b/tumblerd/tumbler-thumbnailer.h
index 76158fa..76158fa 100644
--- a/tumbler/tumbler-thumbnailer.h
+++ b/tumblerd/tumbler-thumbnailer.h
diff --git a/tumbler/tumbler-utils.h b/tumblerd/tumbler-utils.h
index 9b0adfc..9b0adfc 100644
--- a/tumbler/tumbler-utils.h
+++ b/tumblerd/tumbler-utils.h
View Lorry Controller Status