Index: /trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
===================================================================
--- /trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog	(revision 3355)
+++ /trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog	(revision 3356)
@@ -1,2 +1,7 @@
+2007-11-05	Michael Lauer <mickey@openmoko.org>
+
+	* src/openmoko-panel-battery.c: Use g_timeout_add_seconds.
+	Note that we now require glib >= 2.14
+
 2007-11-02	Michael Lauer <mickey@openmoko.org>
 
Index: /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	(revision 3355)
+++ /trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c	(revision 3356)
@@ -1,3 +1,2 @@
-/* vim: set sts=4 sw=4 expandtab: */
 /*  openmoko-panel-battery.c
  *
@@ -26,5 +25,5 @@
 #include <gtk/gtklabel.h>
 #include <dbus/dbus.h>
-
+#include <dbus/dbus-glib-lowlevel.h>
 #include <apm.h>
 #include <string.h>
@@ -104,5 +103,5 @@
 {
     char* icon;
-    static int last_status = -255; /* the status last time we checked */
+    static int last_status = -123; /* the status last time we checked */
 
     apm_info info;
@@ -157,13 +156,8 @@
     local_time = localtime(&t);
 
+    timeout( applet );
     battery_applet_init_dbus( applet );
-
-    /* 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);
-    moko_panel_applet_set_icon( applet->mokoapplet, icon ); // initial status = unknown
+    applet->timeout_id = g_timeout_add_seconds( 60, (GSourceFunc) timeout, applet);
     gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
     return GTK_WIDGET(mokoapplet);
 }
-22