[maemo-commits] [maemo-commits] r11030 - in projects/haf/trunk/libosso: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-04-13 18:10:55 +0300 (Fri, 13 Apr 2007)
New Revision: 11030

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-init.c
   projects/haf/trunk/libosso/src/osso-mime.c
Log:
bugs fixed and so on, you know


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-04-13 14:48:05 UTC (rev 11029)
+++ projects/haf/trunk/libosso/debian/changelog	2007-04-13 15:10:55 UTC (rev 11030)
@@ -2,8 +2,13 @@
 
   * UNRELEASED
   * Fixed typos and referring to DBUS_TYPE_NIL in libosso.h documentation.
+  * Now sending an empty reply message after a MIME handler was called.
+  * Now returning DBUS_HANDLER_RESULT_HANDLED for handled method calls,
+    avoiding an error message generated by the D-Bus library. Fixes: NB#54026
+  * Removed warning to stderr when registering method handler for the
+    same interface etc.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 12 Apr 2007 15:22:55 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 13 Apr 2007 18:07:32 +0300
 
 libosso (2.5-1) unstable; urgency=low
 

Modified: projects/haf/trunk/libosso/src/osso-init.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-init.c	2007-04-13 14:48:05 UTC (rev 11029)
+++ projects/haf/trunk/libosso/src/osso-init.c	2007-04-13 15:10:55 UTC (rev 11030)
@@ -577,6 +577,7 @@
     _osso_hash_value_t *elem;
     gboolean is_method;
     const char *interface;
+    DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 #ifdef OSSOLOG_COMPILE
     gboolean found = FALSE;
 #endif
@@ -624,6 +625,7 @@
 #ifdef OSSOLOG_COMPILE
                 found = TRUE;
 #endif
+                ret = DBUS_HANDLER_RESULT_HANDLED;
             }
 
             list = g_slist_next(list);
@@ -653,7 +655,7 @@
     }	
 #endif
 
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    return ret;
 }
 
 inline int __attribute__ ((visibility("hidden")))
@@ -1057,11 +1059,6 @@
         ULOG_WARN_F(" service: %s", service);
         ULOG_WARN_F(" obj. path: %s", object_path);
         ULOG_WARN_F(" interface: %s", interface);
-        fprintf(stderr, "\nLibosso WARNING: yet another "
-                        "handler registered for:\n");
-        fprintf(stderr, " service: %s\n", service);
-        fprintf(stderr, " obj. path: %s\n", object_path);
-        fprintf(stderr, " interface: %s\n", interface);
 
         /* add it to the list of handlers */
         old->handlers = g_slist_append(old->handlers, handler);

Modified: projects/haf/trunk/libosso/src/osso-mime.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-mime.c	2007-04-13 14:48:05 UTC (rev 11029)
+++ projects/haf/trunk/libosso/src/osso-mime.c	2007-04-13 15:10:55 UTC (rev 11030)
@@ -129,6 +129,7 @@
         gchar *arg = NULL;
 	DBusMessageIter iter;
         osso_mime_cb_f *handler;
+        DBusMessage *reply = NULL;
 
         argc = get_message_arg_count(msg);
         if (argc == 0) {
@@ -158,6 +159,13 @@
         handler = mime->user_cb;
 	(*handler)(mime->user_data, argc, argv);
         free(argv);
+
+        /* send an empty reply message */
+        reply = dbus_message_new_method_return(msg);
+        if (reply != NULL) {
+            dbus_connection_send(osso->cur_conn, reply, NULL);
+            dbus_message_unref(reply);
+        }
     }
 }