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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-05-04 10:59:04 +0300 (Fri, 04 May 2007)
New Revision: 11436

Modified:
   projects/haf/trunk/libosso/debian/changelog
   projects/haf/trunk/libosso/src/osso-init.c
Log:
undid too dangerous fix


Modified: projects/haf/trunk/libosso/debian/changelog
===================================================================
--- projects/haf/trunk/libosso/debian/changelog	2007-05-03 16:21:12 UTC (rev 11435)
+++ projects/haf/trunk/libosso/debian/changelog	2007-05-04 07:59:04 UTC (rev 11436)
@@ -1,3 +1,10 @@
+libosso (2.7-1) unstable; urgency=low
+
+  * UNRELEASED
+  * Undid the change for NB#54026: seems to break stuff.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 04 May 2007 10:56:40 +0300
+
 libosso (2.6-1) unstable; urgency=low
 
   * Fixed typos and referring to DBUS_TYPE_NIL in libosso.h documentation.

Modified: projects/haf/trunk/libosso/src/osso-init.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-init.c	2007-05-03 16:21:12 UTC (rev 11435)
+++ projects/haf/trunk/libosso/src/osso-init.c	2007-05-04 07:59:04 UTC (rev 11436)
@@ -577,7 +577,6 @@
     _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
@@ -625,7 +624,6 @@
 #ifdef OSSOLOG_COMPILE
                 found = TRUE;
 #endif
-                ret = DBUS_HANDLER_RESULT_HANDLED;
             }
 
             list = g_slist_next(list);
@@ -655,7 +653,7 @@
     }	
 #endif
 
-    return ret;
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 inline int __attribute__ ((visibility("hidden")))