r3360 - in trunk/src/target/OM-2007.2/panel-plugins: openmoko-panel-battery/src openmoko-panel-usb/src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-11-05 13:45:42 +0100 (Mon, 05 Nov 2007)
New Revision: 3360

Modified:
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
   trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
Log:
openmoko-panel-[usb|battery]: we're in the same process space, so need to deliver
DBUS_HANDLER_RESULT_NOT_YET_HANDLED after returning from the filter. Otherwise
only one of us will get called.


Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c	2007-11-05 12:22:04 UTC (rev 3359)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c	2007-11-05 12:45:42 UTC (rev 3360)
@@ -67,14 +67,14 @@
         g_debug( "charger connected" );
         // NOTE Bus Enumeration and entering Charging Mode takes a while. If we immediately
         // call timeout here, we will most likely not yet have entered charging mode
-        g_timeout_add_seconds( 3, (GSourceFunc) battery_applet_usb_timeout, applet );
-        return DBUS_HANDLER_RESULT_HANDLED;
+        g_timeout_add_seconds( 5, (GSourceFunc) battery_applet_usb_timeout, applet );
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
     else if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, "ChargerDisconnected" ) )
     {
         g_debug( "charger disconnected" );
         timeout( applet );
-        return DBUS_HANDLER_RESULT_HANDLED;
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
     g_debug( "(unknown dbus message, ignoring)" );

Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c	2007-11-05 12:22:04 UTC (rev 3359)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c	2007-11-05 12:45:42 UTC (rev 3360)
@@ -48,13 +48,13 @@
     {
         g_debug( "-- charger connected" );
         usb_applet_update_status( applet, TRUE );
-        return DBUS_HANDLER_RESULT_HANDLED;
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
     else if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, "ChargerDisconnected" ) )
     {
         g_debug( "-- charger disconnected" );
         usb_applet_update_status( applet, FALSE );
-        return DBUS_HANDLER_RESULT_HANDLED;
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
     g_debug( "(unknown dbus message, ignoring)" );