r4780 - trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src

[erin_yueh at docs.openmoko.org]

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;
 }