[maemo-commits] [maemo-commits] r16709 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins

Mon Nov 17 17:59:46 EET 2008

Author: pvanhoof
Date: 2008-11-17 17:59:41 +0200 (Mon, 17 Nov 2008)
New Revision: 16709

Added:
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
Removed:
   projects/haf/trunk/hildon-thumbnail/daemon/plugin/
Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/configure.ac
   projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
Log:
No need for funny directories for include files

Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 15:59:41 UTC (rev 16709)
@@ -13,7 +13,7 @@
 	* daemon/plugin-runner.c
 	* daemon/thumbnailer.c
 	* daemon/plugin
-	* daemon/plugin/hildon-thumbnail-plugin.h
+	* daemon/hildon-thumbnail-plugin.h
 	* daemon/plugin/Makefile.am
 	* daemon/Makefile.am
 	* daemon/hildon-thumbnail-plugin.c: Making the plugin API public

Modified: projects/haf/trunk/hildon-thumbnail/configure.ac
===================================================================
--- projects/haf/trunk/hildon-thumbnail/configure.ac	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/configure.ac	2008-11-17 15:59:41 UTC (rev 16709)
@@ -177,7 +177,6 @@
 
 AC_OUTPUT(Makefile \
 	  daemon/Makefile \
-	  daemon/plugin/Makefile \
 	  daemon/plugins/Makefile \
 	  thumbs/Makefile \
           albumart-providers/Makefile \

Modified: projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/Makefile.am	2008-11-17 15:59:41 UTC (rev 16709)
@@ -1,4 +1,4 @@
-SUBDIRS = . plugin plugins
+SUBDIRS = . plugins
 
 INCLUDES = -I. \
 	$(DBUS_CFLAGS) \
@@ -13,6 +13,9 @@
 
 noinst_LTLIBRARIES = libshared.la
 
+libhildonthumbnailplugindir=$(includedir)/hildon-thumbnail
+libhildonthumbnailplugin_HEADERS = hildon-thumbnail-plugin.h
+
 libshared_la_SOURCES = utils.h utils.c
 
 libexec_PROGRAMS = hildon-thumbnailerd hildon-thumbnailer-plugin-runner

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -27,7 +27,7 @@
 #include <dbus/dbus-glib-bindings.h>
 #include <gio/gio.h>
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 #include "thumbnailer.h"
 #include "albumart.h"

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -24,7 +24,7 @@
  *
  */
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 static GList *outplugs = NULL;
 static GStaticRecMutex mutex = G_STATIC_REC_MUTEX_INIT;

Copied: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h (from rev 16708, projects/haf/trunk/hildon-thumbnail/daemon/plugin/hildon-thumbnail-plugin.h)

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 #include <dbus/dbus-glib-bindings.h>
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 #define MANAGER_SERVICE        "org.freedesktop.thumbnailer"
 #define MANAGER_PATH           "/org/freedesktop/thumbnailer/Manager"

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -43,7 +43,7 @@
 #include "utils.h"
 #include "epeg-plugin.h"
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 
 static gchar **supported = NULL;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -41,7 +41,7 @@
 #include "utils.h"
 #include "exec-plugin.h"
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 static gchar **supported = NULL;
 static gboolean do_cropped = TRUE;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -42,7 +42,7 @@
 
 #include "utils.h"
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 static gboolean had_init = FALSE;
 static gboolean is_active = TRUE;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -43,7 +43,7 @@
 #include "utils.h"
 #include "gdkpixbuf-plugin.h"
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 #ifndef gdk_pixbuf_new_from_stream_at_scale
 /* It's implemented in pixbuf-io-loader.c in this case */

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -42,7 +42,7 @@
 
 #include "utils.h"
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 static gboolean had_init = FALSE;
 static gboolean is_active = FALSE;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -33,7 +33,7 @@
 #include <gst/gst.h>
 #include <gio/gio.h>
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 #include "utils.h"
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-17 15:56:35 UTC (rev 16708)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-17 15:59:41 UTC (rev 16709)
@@ -38,7 +38,7 @@
 #include "thumbnailer-marshal.h"
 #include "thumbnailer-glue.h"
 
-#include <plugin/hildon-thumbnail-plugin.h>
+#include <hildon-thumbnail-plugin.h>
 
 #include "dbus-utils.h"
 #include "utils.h"


