[maemo-commits] [maemo-commits] r15973 - projects/haf/branches/hildon-thumbnail/daemonize/daemon

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-09-02 19:13:40 +0300 (Tue, 02 Sep 2008)
New Revision: 15973

Modified:
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/dbus-utils.h
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c
Log:
DBC clausules

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/dbus-utils.h
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/dbus-utils.h	2008-09-02 16:09:45 UTC (rev 15972)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/dbus-utils.h	2008-09-02 16:13:40 UTC (rev 15973)
@@ -12,7 +12,7 @@
 			g_set_error (&error,				\
 				     DBUS_ERROR,			\
 				     0,					\
-				     _("Assertion `%s' failed"),	\
+				     "Assertion `%s' failed",		\
 				     #expr);				\
 									\
 			dbus_g_method_return_error (context, error);	\

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c	2008-09-02 16:09:45 UTC (rev 15972)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c	2008-09-02 16:13:40 UTC (rev 15973)
@@ -4,8 +4,8 @@
 
 #include "manager.h"
 #include "manager-glue.h"
+#include "dbus-utils.h"
 
-
 #define MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_MANAGER, ManagerPrivate))
 
 G_DEFINE_TYPE (Manager, manager, G_TYPE_OBJECT)
@@ -60,8 +60,12 @@
 {
 	ManagerPrivate *priv = MANAGER_GET_PRIVATE (object);
 	DBusGProxy *mime_proxy;
-	gchar *sender = dbus_g_method_get_sender (context);
+	gchar *sender;
 
+	dbus_async_return_if_fail (mime_type != NULL, context);
+
+	sender = dbus_g_method_get_sender (context);
+
 	mime_proxy = dbus_g_proxy_new_for_name (priv->connection, sender, 
 						MANAGER_PATH,
 						MANAGER_INTERFACE);

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c	2008-09-02 16:09:45 UTC (rev 15972)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c	2008-09-02 16:13:40 UTC (rev 15973)
@@ -135,6 +135,8 @@
 	guint urls_size = g_strv_length (urls), i = 0;
 	static guint num = 0;
 
+	dbus_async_return_if_fail (urls != NULL, context);
+
 	task->num = num++;
 	task->object = g_object_ref (object);
 	task->urls = (GStrv) g_malloc0 (sizeof (gchar *) * (urls_size + 1));
@@ -269,11 +271,14 @@
 void
 thumbnailer_move (Thumbnailer *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context)
 {
+	dbus_async_return_if_fail (from_urls != NULL, context);
+	dbus_async_return_if_fail (to_urls != NULL, context);
 }
 
 void
 thumbnailer_delete (Thumbnailer *object, GStrv urls, DBusGMethodInvocation *context)
 {
+	dbus_async_return_if_fail (urls != NULL, context);
 }
 
 static void