Send commitlog mailing list submissions to
        commitlog@lists.openmoko.org

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. r4779 -
      trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src
      ([EMAIL PROTECTED])
   2. r4780 -
      trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src
      ([EMAIL PROTECTED])
--- Begin Message ---
Author: erin_yueh
Date: 2008-11-11 07:38:18 +0100 (Tue, 11 Nov 2008)
New Revision: 4779

Modified:
   
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
Log:
applied the patch for bug#1833: Getting rid of battery and usb useless dbus 
related debug output


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
        2008-11-11 03:43:36 UTC (rev 4778)
+++ 
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
        2008-11-11 06:38:18 UTC (rev 4779)
@@ -41,23 +41,26 @@
 
 DBusHandlerResult signal_filter (DBusConnection *bus, DBusMessage *msg, void 
*user_data)
 {
-    UsbApplet* applet = (UsbApplet*) user_data;
+    if ( !g_strcmp0( dbus_message_get_interface(msg), CHARGER_DBUS_INTERFACE ) 
)
+    {
+           UsbApplet* applet = (UsbApplet*) user_data;
 
-    g_debug( "usb_applet: signal_filter" );
-    if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, 
"ChargerConnected" ) )
-    {
-        g_debug( "-- charger connected" );
-        usb_applet_update_status( applet, TRUE );
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+           g_debug( "usb_applet: signal_filter" );
+           if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, 
"ChargerConnected" ) )
+           {
+               g_debug( "-- charger connected" );
+               usb_applet_update_status( applet, TRUE );
+               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_NOT_YET_HANDLED;
+           }
+
+           g_debug( "(unknown dbus message, ignoring)" );
     }
-    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_NOT_YET_HANDLED;
-    }
-
-    g_debug( "(unknown dbus message, ignoring)" );
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 




--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-11-11 08:29:58 +0100 (Tue, 11 Nov 2008)
New Revision: 4780

Modified:
   
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
Log:
applied patch for bug#1833: Getting rid of battery and usb useless dbus related 
debug output


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
        2008-11-11 06:38:18 UTC (rev 4779)
+++ 
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
        2008-11-11 07:29:58 UTC (rev 4780)
@@ -64,23 +64,27 @@
 
 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" ) )
+    if ( !g_strcmp0( dbus_message_get_interface(msg), CHARGER_DBUS_INTERFACE ) 
)
     {
-        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( 5, (GSourceFunc) battery_applet_usb_timeout, 
applet );
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+           g_debug( "battery_applet: signal_filter" );
+           if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, 
"ChargerConnected" ) )
+           {
+               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( 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_NOT_YET_HANDLED;
+           }
+
+           g_debug( "(unknown dbus message, ignoring)" );
     }
-    else if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE, 
"ChargerDisconnected" ) )
-    {
-        g_debug( "charger disconnected" );
-        timeout( applet );
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-    }
 
-    g_debug( "(unknown dbus message, ignoring)" );
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 




--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to