[maemo-commits] [maemo-commits] r15941 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Sep 2 14:37:19 EEST 2008
- Previous message: [maemo-commits] r15940 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
- Next message: [maemo-commits] r15942 - in projects/haf/trunk/sapwood: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2008-09-02 14:37:18 +0300 (Tue, 02 Sep 2008) New Revision: 15941 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/thumbnailer.c projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h Log: 2008-09-02 Philip Van Hoof <philip at codeminded.be> daemon/thumbnailer.h daemon/manager.h daemon/thumbnailer.c daemon/manager.c: Bugfix, DBusGConnection is not a GObject Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-02 11:29:07 UTC (rev 15940) +++ projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog 2008-09-02 11:37:18 UTC (rev 15941) @@ -1,5 +1,12 @@ 2008-09-02 Philip Van Hoof <philip at codeminded.be> + daemon/thumbnailer.h + daemon/manager.h + daemon/thumbnailer.c + daemon/manager.c: Bugfix, DBusGConnection is not a GObject + +2008-09-02 Philip Van Hoof <philip at codeminded.be> + daemon/hildon-thumbnail-daemon.c daemon/plugins/image-png.xml daemon/plugins/default.c Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c 2008-09-02 11:29:07 UTC (rev 15940) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c 2008-09-02 11:37:18 UTC (rev 15941) @@ -10,10 +10,6 @@ #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)) -#define MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_MANAGER, ManagerClass)) -#define MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_MANAGER, ManagerClass)) #define MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_MANAGER, ManagerPrivate)) G_DEFINE_TYPE (Manager, manager, G_TYPE_OBJECT) @@ -122,9 +118,7 @@ manager_set_connection (Manager *object, DBusGConnection *connection) { ManagerPrivate *priv = MANAGER_GET_PRIVATE (object); - if (priv->connection) - g_object_unref (priv->connection); - priv->connection = g_object_ref (connection); + priv->connection = connection; } static void @@ -150,7 +144,7 @@ break; case PROP_CONNECTION: manager_set_connection (MANAGER (object), - g_value_get_object (value)); + g_value_get_pointer (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -173,7 +167,7 @@ g_value_set_object (value, priv->proxy); break; case PROP_CONNECTION: - g_value_set_object (value, priv->connection); + g_value_set_pointer (value, priv->connection); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -200,10 +194,9 @@ g_object_class_install_property (object_class, PROP_CONNECTION, - g_param_spec_object ("connection", - "DBus connection", - "DBus connection", - DBUS_TYPE_G_CONNECTION, + g_param_spec_pointer ("connection", + "DBus connection", + "DBus connection", G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.h 2008-09-02 11:29:07 UTC (rev 15940) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.h 2008-09-02 11:37:18 UTC (rev 15941) @@ -1,6 +1,11 @@ #ifndef __MANAGER_H__ #define __MANAGER_H__ +#define TYPE_MANAGER (manager_get_type()) +#define MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_MANAGER, Manager)) +#define MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_MANAGER, ManagerClass)) +#define MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_MANAGER, ManagerClass)) + typedef struct Manager Manager; typedef struct ManagerClass ManagerClass; @@ -12,8 +17,9 @@ GObjectClass parent; }; +GType manager_get_type (void); + void manager_register (Manager *object, gchar *mime_type, DBusGMethodInvocation *context); - GHashTable* manager_get_handlers (Manager *object); void manager_do_stop (void); Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c 2008-09-02 11:29:07 UTC (rev 15940) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c 2008-09-02 11:37:18 UTC (rev 15941) @@ -10,10 +10,6 @@ #define THUMBNAILER_INTERFACE "org.freedesktop.thumbnailer" -#define TYPE_THUMBNAILER (thumbnailer_get_type()) -#define THUMBNAILER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_THUMBNAILER, Thumbnailer)) -#define THUMBNAILER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_THUMBNAILER, ThumbnailerClass)) -#define THUMBNAILER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_THUMBNAILER, ThumbnailerClass)) #define THUMBNAILER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_THUMBNAILER, ThumbnailerPrivate)) G_DEFINE_TYPE (Thumbnailer, thumbnailer, G_TYPE_OBJECT) @@ -63,9 +59,7 @@ thumbnailer_set_connection (Thumbnailer *object, DBusGConnection *connection) { ThumbnailerPrivate *priv = THUMBNAILER_GET_PRIVATE (object); - if (priv->connection) - g_object_unref (priv->connection); - priv->connection = g_object_ref (connection); + priv->connection = connection; } static void @@ -100,7 +94,7 @@ break; case PROP_CONNECTION: thumbnailer_set_connection (THUMBNAILER (object), - g_value_get_object (value)); + g_value_get_pointer (value)); break; case PROP_MANAGER: thumbnailer_set_manager (THUMBNAILER (object), @@ -127,7 +121,7 @@ g_value_set_object (value, priv->proxy); break; case PROP_CONNECTION: - g_value_set_object (value, priv->connection); + g_value_set_pointer (value, priv->connection); break; case PROP_MANAGER: g_value_set_object (value, priv->manager); @@ -157,19 +151,18 @@ g_object_class_install_property (object_class, PROP_CONNECTION, - g_param_spec_object ("connection", - "DBus connection", - "DBus connection", - DBUS_TYPE_G_CONNECTION, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT)); + g_param_spec_pointer ("connection", + "DBus connection", + "DBus connection", + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, PROP_MANAGER, g_param_spec_object ("manager", "Manager", "Manager", - DBUS_TYPE_G_PROXY, + TYPE_MANAGER, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h =================================================================== --- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h 2008-09-02 11:29:07 UTC (rev 15940) +++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h 2008-09-02 11:37:18 UTC (rev 15941) @@ -3,6 +3,11 @@ #include "manager.h" +#define TYPE_THUMBNAILER (thumbnailer_get_type()) +#define THUMBNAILER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_THUMBNAILER, Thumbnailer)) +#define THUMBNAILER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_THUMBNAILER, ThumbnailerClass)) +#define THUMBNAILER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_THUMBNAILER, ThumbnailerClass)) + typedef struct Thumbnailer Thumbnailer; typedef struct ThumbnailerClass ThumbnailerClass; @@ -14,6 +19,8 @@ GObjectClass parent; }; +GType thumbnailer_get_type (void); + void thumbnailer_create (Thumbnailer *object, GStrv urls, DBusGMethodInvocation *context); void thumbnailer_move (Thumbnailer *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context); void thumbnailer_delete (Thumbnailer *object, GStrv urls, DBusGMethodInvocation *context);
- Previous message: [maemo-commits] r15940 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
- Next message: [maemo-commits] r15942 - in projects/haf/trunk/sapwood: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]