[maemo-commits] [maemo-commits] r16053 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Sep 8 14:40:05 EEST 2008
- Previous message: [maemo-commits] r16052 - projects/connectivity/bluez-debian/trunk
- Next message: [maemo-commits] r16054 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2008-09-08 14:39:57 +0300 (Mon, 08 Sep 2008) New Revision: 16053 Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.h projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.xml projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.xml projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml Log: 2008-09-08 Philip Van Hoof <pvanhoof at gnome.org> * daemon/plugin-runner.c * daemon/manager.c * daemon/thumbnailer.h * daemon/manager.h * daemon/plugin-runner.xml * daemon/thumbnailer.xml * daemon/manager.xml: Changed specification to have more sane namespace names Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-08 11:39:57 UTC (rev 16053) @@ -1,3 +1,14 @@ +2008-09-08 Philip Van Hoof <pvanhoof at gnome.org> + + * daemon/plugin-runner.c + * daemon/manager.c + * daemon/thumbnailer.h + * daemon/manager.h + * daemon/plugin-runner.xml + * daemon/thumbnailer.xml + * daemon/manager.xml: Changed specification to have more sane + namespace names + 2008-09-05 Philip Van Hoof <pvanhoof at gnome.org> * daemon/plugin-runner.c Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c 2008-09-08 11:39:57 UTC (rev 16053) @@ -66,7 +66,6 @@ return proxy; } - static void manager_add (Manager *object, gchar *mime_type, gchar *name) { @@ -83,7 +82,7 @@ mime_proxy = dbus_g_proxy_new_for_name (priv->connection, name, path, - name); + SPECIALIZED_INTERFACE); g_free (path); Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.h 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.h 2008-09-08 11:39:57 UTC (rev 16053) @@ -25,9 +25,9 @@ * */ -#define MANAGER_SERVICE "org.freedesktop.Thumbnailer" -#define MANAGER_PATH "/org/freedesktop/Thumbnailer/Manager" -#define MANAGER_INTERFACE "org.freedesktop.Thumbnailer.Manager" +#define MANAGER_SERVICE "org.freedesktop.thumbnailer" +#define MANAGER_PATH "/org/freedesktop/thumbnailer/Manager" +#define MANAGER_INTERFACE "org.freedesktop.thumbnailer.Manager" #define TYPE_MANAGER (manager_get_type()) #define MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_MANAGER, Manager)) Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.xml =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.xml 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.xml 2008-09-08 11:39:57 UTC (rev 16053) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <node name="/"> - <interface name="org.freedesktop.Thumbnailer.Manager"> + <interface name="org.freedesktop.thumbnailer.Manager"> <method name="Register"> <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/> <arg type="s" name="mime_type" direction="in" /> Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c 2008-09-08 11:39:57 UTC (rev 16053) @@ -29,11 +29,10 @@ #include "hildon-thumbnail-plugin.h" +#define MANAGER_SERVICE "org.freedesktop.thumbnailer" +#define MANAGER_PATH "/org/freedesktop/thumbnailer/Manager" +#define MANAGER_INTERFACE "org.freedesktop.thumbnailer.Manager" -#define MANAGER_SERVICE "org.freedesktop.Thumbnailer" -#define MANAGER_PATH "/org/freedesktop/Thumbnailer/Manager" -#define MANAGER_INTERFACE "org.freedesktop.Thumbnailer.Manager" - #define TYPE_DAEMON (daemon_get_type()) #define DAEMON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_DAEMON, Daemon)) #define DAEMON_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_DAEMON, DaemonClass)) @@ -187,18 +186,18 @@ GError *error = NULL; DaemonPrivate *priv = DAEMON_GET_PRIVATE (object); GModule *module = priv->module; - DBusGProxy *manager_proxy; - guint i = 0; - GStrv supported; - manager_proxy = dbus_g_proxy_new_for_name (priv->connection, - MANAGER_SERVICE, - MANAGER_PATH, - MANAGER_INTERFACE); - hildon_thumbnail_plugin_do_init (module, &error); if (!error && do_register) { + DBusGProxy *manager_proxy; + GStrv supported; + guint i = 0; + manager_proxy = dbus_g_proxy_new_for_name (priv->connection, + MANAGER_SERVICE, + MANAGER_PATH, + MANAGER_INTERFACE); + supported = hildon_thumbnail_plugin_get_supported (module); if (supported) { @@ -216,6 +215,7 @@ i++; } } + g_object_unref (manager_proxy); } if (error) { @@ -223,7 +223,6 @@ g_error_free (error); } - g_object_unref (manager_proxy); } static gchar *module_name; @@ -251,15 +250,6 @@ { NULL } }; -DBusGObjectInfo custom_info = { - 0, - dbus_glib_plugin_runner_methods, - 1, -"org.freedesktop.Thumbnailer\0Create\0A\0uris\0I\0as\0\0\0", -"\0", -"\0" -}; - int main (int argc, char **argv) { @@ -272,8 +262,6 @@ GMainLoop *main_loop; GObject *object; GModule *module; - gchar str[4000]; - guint len; g_type_init (); @@ -318,21 +306,13 @@ "module", module, NULL); - len = strlen (bus_name); - memcpy (str, bus_name, len); - memcpy (str+len, "\0Create\0A\0uris\0I\0as\0\0\0", 30); - - custom_info.data = str; - - dbus_g_object_type_install_info (G_OBJECT_TYPE (object), - &custom_info); + &dbus_glib_plugin_runner_object_info); dbus_g_connection_register_g_object (connection, bus_path, object); - daemon_start (DAEMON (object), dynamic_register); main_loop = g_main_loop_new (NULL, FALSE); Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.xml =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.xml 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.xml 2008-09-08 11:39:57 UTC (rev 16053) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <node name="/"> - <interface name="org.freedesktop.Thumbnailer"> + <interface name="org.freedesktop.thumbnailer.Thumbnailer"> <method name="Create"> <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/> <arg type="as" name="uris" direction="in" /> Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h 2008-09-08 11:39:57 UTC (rev 16053) @@ -29,9 +29,10 @@ #include "manager.h" -#define THUMBNAILER_SERVICE "org.freedesktop.Thumbnailer" -#define THUMBNAILER_PATH "/org/freedesktop/Thumbnailer" -#define THUMBNAILER_INTERFACE "org.freedesktop.Thumbnailer" +#define THUMBNAILER_SERVICE "org.freedesktop.thumbnailer" +#define THUMBNAILER_PATH "/org/freedesktop/thumbnailer/Generic" +#define THUMBNAILER_INTERFACE "org.freedesktop.thumbnailer.Generic" +#define SPECIALIZED_INTERFACE "org.freedesktop.thumbnailer.Thumbnailer" #define TYPE_THUMBNAILER (thumbnailer_get_type()) #define THUMBNAILER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_THUMBNAILER, Thumbnailer)) Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml 2008-09-08 11:27:09 UTC (rev 16052) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml 2008-09-08 11:39:57 UTC (rev 16053) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <node name="/"> - <interface name="org.freedesktop.Thumbnailer"> + <interface name="org.freedesktop.thumbnailer.Generic"> <method name="Queue"> <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- Previous message: [maemo-commits] r16052 - projects/connectivity/bluez-debian/trunk
- Next message: [maemo-commits] r16054 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]