Changeset 3359

Timestamp:

11/05/07 13:22:04 (6 years ago)

Author:

mickey

Message:

usb|battery panel plugin: take into account usb enumeration timings

Location:

trunk/src/target/OM-2007.2/panel-plugins

Files:

• openmoko-panel-battery/src/openmoko-panel-battery.c (modified) (2 diffs)
• openmoko-panel-usb/src/openmoko-panel-usb.c (modified) (2 diffs)

trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c

@@ -54 +54 @@
 #define CHARGER_DBUS_INTERFACE    "org.freedesktop.PowerManagement"
 
-DBusHandlerResult signal_filter (DBusConnection *bus, DBusMessage *msg, void *user_data)
+static gboolean battery_applet_usb_timeout( BatteryApplet* applet )
 {
-    g_debug( "signal_filter" );
+    timeout( applet );
+    return FALSE;
+}
+
+DBusHandlerResult signal_filter( DBusConnection *bus, DBusMessage *msg, BatteryApplet* applet )
+{
+    g_debug( "battery_applet: signal_filter" );
     if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, "ChargerConnected" ) )
     {
-        g_debug( "connected" );
-        timeout( user_data );
+        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;
     }
     else if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, "ChargerDisconnected" ) )
     {
-        g_debug( "disconnected" );
-        timeout( user_data );
+        g_debug( "charger disconnected" );
+        timeout( applet );
         return DBUS_HANDLER_RESULT_HANDLED;
     }
@@ -99 +107 @@
 
 /* Called frequently */
-static gboolean
-timeout (BatteryApplet *applet)
+static gboolean timeout( BatteryApplet *applet )
 {
+    g_debug( "battery_applet: timeout" );
     char* icon;
     static int last_status = -123; /* the status last time we checked */

trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c

@@ -44 +44 @@
     UsbApplet* applet = (UsbApplet*) user_data;
 
-    g_debug( "signal_filter" );
+    g_debug( "usb_applet: signal_filter" );
     if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, "ChargerConnected" ) )
     {
-        g_debug( "connected" );
+        g_debug( "-- charger connected" );
         usb_applet_update_status( applet, TRUE );
         return DBUS_HANDLER_RESULT_HANDLED;
@@ -53 +53 @@
     else if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, "ChargerDisconnected" ) )
     {
-        g_debug( "disconnected" );
+        g_debug( "-- charger disconnected" );
         usb_applet_update_status( applet, FALSE );
         return DBUS_HANDLER_RESULT_HANDLED;