[maemo-commits] [maemo-commits] r15936 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Sep 1 16:34:06 EEST 2008
- Previous message: [maemo-commits] r15935 - projects/connectivity/bluez-debian/tags
- Next message: [maemo-commits] r15938 - in projects/haf/trunk/sapwood: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2008-09-01 16:34:04 +0300 (Mon, 01 Sep 2008) New Revision: 15936 Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.h projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.xml projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.thumbnailer.service.in Removed: projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.Thumbnailer.service.in Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog projects/haf/branches/hildon-thumbnail/daemonize/daemon/ projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.h projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/image-png.xml Log: 2008-09-01 Philip Van Hoof <philip at codeminded.be> daemon/hildon-thumbnail-daemon.c daemon/plugins/image-png.xml daemon/plugins/default.c daemon/plugins/default.h daemon/generic.h daemon/Makefile.am daemon/generic.xml daemon/generic.c daemon/org.freedesktop.Thumbnailer.service.in daemon/org.freedesktop.thumbnailer.service.in: Installed a org.freedesktop.thumbnailer.generic, according to changed specifications Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-01 13:34:04 UTC (rev 15936) @@ -1,5 +1,20 @@ 2008-09-01 Philip Van Hoof <philip at codeminded.be> + daemon/hildon-thumbnail-daemon.c + daemon/plugins/image-png.xml + daemon/plugins/default.c + daemon/plugins/default.h + daemon/generic.h + daemon/Makefile.am + daemon/generic.xml + daemon/generic.c + daemon/org.freedesktop.Thumbnailer.service.in + daemon/org.freedesktop.thumbnailer.service.in: Installed a + org.freedesktop.thumbnailer.generic, according to changed + specifications + +2008-09-01 Philip Van Hoof <philip at codeminded.be> + * Removed generated files from the repository * Created daemon subdirectory, unfinished * Cleanups here and there Property changes on: projects/haf/branches/hildon-thumbnail/daemonize/daemon ___________________________________________________________________ Name: svn:ignore - Makefile.in hildon-thumbnailerd .libs .deps org.freedesktop.Thumbnailer.service Makefile + Makefile.in hildon-thumbnailerd .libs .deps org.freedesktop.thumbnailer.service Makefile generic-glue.h Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/Makefile.am 2008-09-01 13:34:04 UTC (rev 15936) @@ -14,7 +14,9 @@ hildon_thumbnailerd_SOURCES = \ $(include_HEADERS) \ hildon-thumbnail-plugin.c \ - hildon-thumbnail-daemon.c + hildon-thumbnail-daemon.c \ + generic.c \ + generic.h hildon_thumbnailerd_LDADD = \ $(DBUS_LIBS) \ @@ -22,19 +24,25 @@ $(GMODULE_LIBS) # Services -org.freedesktop.Thumbnailer_servicedir = $(DBUS_SERVICES_DIR) -org.freedesktop.Thumbnailer_service_DATA = org.freedesktop.Thumbnailer.service +org.freedesktop.thumbnailer_servicedir = $(DBUS_SERVICES_DIR) +org.freedesktop.thumbnailer_service_DATA = org.freedesktop.thumbnailer.service %.service: %.service.in @sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@ +%-glue.h: $(top_srcdir)/daemon/%.xml + $(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ -EXTRA_DIST = \ - $(org.freedesktop.Thumbnailer_service_DATA) +BUILT_SOURCES = generic-glue.h +configdir = $(datadir)/hildon-thumbnail +config_DATA = generic.xml +EXTRA_DIST = $(BUILT_SOURCES) $(config_DATA) \ + $(org.freedesktop.thumbnailer_service_DATA) -CLEANFILES = \ - $(org.freedesktop.Thumbnailer_service_DATA) +CLEANFILES = $(BUILT_SOURCES) \ + $(org.freedesktop.thumbnailer_service_DATA) + Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.c 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.c 2008-09-01 13:34:04 UTC (rev 15936) @@ -0,0 +1,69 @@ +#include <glib.h> +#include <dbus/dbus-glib-bindings.h> + +#include "generic.h" +#include "generic-glue.h" + +#define GENERIC_SERVICE "org.freedesktop.thumbnailer.generic" +#define GENERIC_PATH "/org/freedesktop/thumbnailer/generic" +#define GENERIC_INTERFACE "org.freedesktop.thumbnailer.generic" + +void +generic_create (Generic *object, GStrv urls, DBusGMethodInvocation *context) +{ +} + +void +generic_move (Generic *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context) +{ +} + +void +generic_delete (Generic *object, GStrv urls, DBusGMethodInvocation *context) +{ +} + + +static void +generic_class_init (GenericClass *klass) +{ +} + +static void +generic_init (Generic *object) +{ +} + + +G_DEFINE_TYPE(Generic, generic, G_TYPE_OBJECT) + +void +generic_do_stop (void) +{ +} + + +void +generic_do_init (DBusGConnection *connection, GError **error) +{ + guint result; + DBusGProxy *proxy; + GObject *object; + + proxy = dbus_g_proxy_new_for_name (connection, + DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS); + + org_freedesktop_DBus_request_name (proxy, GENERIC_SERVICE, + DBUS_NAME_FLAG_DO_NOT_QUEUE, + &result, error); + + object = g_object_new (generic_get_type (), NULL); + + dbus_g_object_type_install_info (G_OBJECT_TYPE (object), + &dbus_glib_generic_object_info); + + dbus_g_connection_register_g_object (connection, GENERIC_PATH, object); + +} Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.h 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.h 2008-09-01 13:34:04 UTC (rev 15936) @@ -0,0 +1,22 @@ +#ifndef __GENERIC_H__ +#define __GENERIC_H__ + +typedef struct Generic Generic; +typedef struct GenericClass GenericClass; + +struct Generic { + GObject parent; +}; + +struct GenericClass { + GObjectClass parent; +}; + +void generic_create (Generic *object, GStrv urls, DBusGMethodInvocation *context); +void generic_move (Generic *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context); +void generic_delete (Generic *object, GStrv urls, DBusGMethodInvocation *context); + +void generic_do_stop (void); +void generic_do_init (DBusGConnection *connection, GError **error); + +#endif Added: projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.xml =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.xml 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/generic.xml 2008-09-01 13:34:04 UTC (rev 15936) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<node name="/"> + <interface name="org.freedesktop.Thumbnailer.generic"> + <method name="Create"> + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/> + <arg type="as" name="uris" direction="in" /> + </method> + <method name="Move"> + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/> + <arg type="as" name="from_uris" direction="in" /> + <arg type="as" name="to_uris" direction="in" /> + </method> + <method name="Delete"> + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/> + <arg type="as" name="uris" direction="in" /> + </method> + </interface> +</node> Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c 2008-09-01 13:34:04 UTC (rev 15936) @@ -27,6 +27,8 @@ #include "hildon-thumbnail-plugin.h" +#include "generic.h" + int main (int argc, char **argv) { @@ -52,6 +54,8 @@ * dropped, and removed ones get removed (and therefore must * shut down) */ + generic_do_init (connection, &error); + module = hildon_thumbnail_plugin_load ("default"); hildon_thumbnail_plugin_do_init (module, connection, &error); @@ -60,6 +64,8 @@ hildon_thumbnail_plugin_do_stop (module); + generic_do_stop (); + g_main_loop_unref (main_loop); } Deleted: projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.Thumbnailer.service.in =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.Thumbnailer.service.in 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.Thumbnailer.service.in 2008-09-01 13:34:04 UTC (rev 15936) @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.freedesktop.Thumbnailer -Exec=@libexecdir@/hildon-thumbnailerd Copied: projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.thumbnailer.service.in (from rev 15928, projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.Thumbnailer.service.in) =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.Thumbnailer.service.in 2008-09-01 09:36:59 UTC (rev 15928) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/org.freedesktop.thumbnailer.service.in 2008-09-01 13:34:04 UTC (rev 15936) @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.thumbnailer.generic +Exec=@libexecdir@/hildon-thumbnailerd Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.c 2008-09-01 13:34:04 UTC (rev 15936) @@ -6,33 +6,22 @@ #include "image-png-glue.h" #include "hildon-thumbnail-plugin.h" -typedef struct ImagePng ImagePng; -typedef struct ImagePngClass ImagePngClass; +#define DEFAULT_PNG_SERVICE "org.freedesktop.thumbnailer.image-png" +#define DEFAULT_PNG_PATH "/org/freedesktop/thumbnailer/image-png" +#define DEFAULT_PNG_INTERFACE "org.freedesktop.thumbnailer.image-png" -struct ImagePng { - GObject parent; -}; - -struct ImagePngClass { - GObjectClass parent; -}; - -#define DEFAULT_PNG_SERVICE "org.freedesktop.Thumbnailer.image-png" -#define DEFAULT_PNG_PATH "/org/freedesktop/Thumbnailer/image-png" -#define DEFAULT_PNG_INTERFACE "org.freedesktop.Thumbnailer.image-png" - void -image_png_create (GObject *object, GStrv urls, DBusGMethodInvocation *context) +image_png_create (ImagePng *object, GStrv urls, DBusGMethodInvocation *context) { } void -image_png_move (GObject *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context) +image_png_move (ImagePng *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context) { } void -image_png_delete (GObject *object, GStrv urls, DBusGMethodInvocation *context) +image_png_delete (ImagePng *object, GStrv urls, DBusGMethodInvocation *context) { } Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.h 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/default.h 2008-09-01 13:34:04 UTC (rev 15936) @@ -1,8 +1,19 @@ #ifndef __DEFAULT_H__ #define __DEFAULT_H__ -void image_png_create (GObject *object, GStrv urls, DBusGMethodInvocation *context); -void image_png_move (GObject *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context); -void image_png_delete (GObject *object, GStrv urls, DBusGMethodInvocation *context); +typedef struct ImagePng ImagePng; +typedef struct ImagePngClass ImagePngClass; +struct ImagePng { + GObject parent; +}; + +struct ImagePngClass { + GObjectClass parent; +}; + +void image_png_create (ImagePng *object, GStrv urls, DBusGMethodInvocation *context); +void image_png_move (ImagePng *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context); +void image_png_delete (ImagePng *object, GStrv urls, DBusGMethodInvocation *context); + #endif Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/image-png.xml =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/image-png.xml 2008-09-01 13:28:09 UTC (rev 15935) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/image-png.xml 2008-09-01 13:34:04 UTC (rev 15936) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - <node name="/"> - <interface name="org.freedesktop.Thumbnailer.image-png"> <method name="Create"> <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/> @@ -17,5 +15,4 @@ <arg type="as" name="uris" direction="in" /> </method> </interface> - </node>
- Previous message: [maemo-commits] r15935 - projects/connectivity/bluez-debian/tags
- Next message: [maemo-commits] r15938 - in projects/haf/trunk/sapwood: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]