Changeset 3272

Timestamp:

10/25/07 18:57:18 (6 years ago)

Author:

thomas

Message:

• src/openmoko-panel-battery.c: (timeout),

(mb_panel_applet_create): Only update the display if the battery status

has changed

Location:

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

Files:

• ChangeLog (modified) (1 diff)
• src/openmoko-panel-battery.c (modified) (9 diffs)

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

@@ -1 @@
-2007-09-02      Michael Lauer <mickey@openmoko.org>
+2007-10-25  Thomas Wood  <thomas@openedhand.com>
+
+        * src/openmoko-panel-battery.c: (timeout),
+        (mb_panel_applet_create): Only update the display if the battery status
+         has changed
+
+2007-09-02 Michael Lauer <mickey@openmoko.org>
 
         * src/openmoko-battery-plugin.c:

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

@@ +1 @@
+/* vim: set sts=4 sw=4 expandtab: */
 /*  openmoko-panel-battery.c
  *
@@ -20 +21 @@
  */
 
+
 #include <libmokopanelui2/moko-panel-applet.h>
 
@@ -30 +32 @@
 #define JUICE_PIXMAPS 6
 
-#define DEBUG_THIS_FILE
-
 typedef struct {
     MokoPanelApplet* mokoapplet;
@@ -37 +37 @@
 } BatteryApplet;
 
+/* applets cannot be unloaded yet */
+#if 0
 static void
 battery_applet_free (BatteryApplet *applet)
@@ -43 +45 @@
     g_slice_free (BatteryApplet, applet);
 }
+#endif
 
 /* Called every 5 minutes */
@@ -48 +51 @@
 timeout (BatteryApplet *applet)
 {
-    // g_debug( "openmoko-panel-battery::timeout" );
+    char* icon;
+    static int last_status = -255; /* the status last time we checked */
 
     apm_info info;
@@ -55 +59 @@
     apm_read (&info);
 
-    char* icon;
+    /* don't do any update if status is the same as the last time */
+    if (last_status == info.battery_status)
+    {
+        return TRUE;
+    }
 
     //FIXME Can we actually find out, when the battery is full?
 
-    // g_debug( "-- info.battery_status = %0xd", info.battery_status );
-    // g_debug( "-- info.battery_percentage = %0xd", info.battery_percentage );
+    last_status = info.battery_status;
 
     if ( info.battery_status == BATTERY_STATUS_ABSENT ||
@@ -83 +90 @@
     }
 
-    //FIXME Check whether we actually need to update
+    moko_panel_applet_set_icon( applet->mokoapplet, icon );
 
-    moko_panel_applet_set_icon( applet->mokoapplet, icon );
     return TRUE;
 }
@@ -98 +104 @@
     t = time( NULL );
     local_time = localtime(&t);
-#ifndef DEBUG_THIS_FILE
-    applet->timeout_id = g_timeout_add( 60 * 1000 * 5, (GSourceFunc) timeout, applet);
+
+    //FIXME Add source watching for charger insertion event on /dev/input/event1
+
+    /* should use g_timeout_add_seconds() here to save power, but it is only
+     * available in glib >= 2.14
+     */
+    applet->timeout_id = g_timeout_add ( 10 * 1000, (GSourceFunc) timeout, applet);
     timeout(applet);
-    //FIXME Add source watching for charger insertion event on /dev/input/event1
-#else
-    applet->timeout_id = g_timeout_add( 10 * 1000, (GSourceFunc) timeout, applet);
-#endif
+
     moko_panel_applet_set_icon( mokoapplet, PKGDATADIR "/Battery_00.png" );
     gtk_widget_show_all( GTK_WIDGET(mokoapplet) );