r3356 - in trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery: . src
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Sun Nov 4 23:14:14 CET 2007
Author: mickey
Date: 2007-11-04 23:14:13 +0100 (Sun, 04 Nov 2007)
New Revision: 3356
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
Log:
openmoko-panel-battery: use g_timeout_add_seconds (needs glib >= 2.14 now)
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog 2007-11-04 19:30:41 UTC (rev 3355)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog 2007-11-04 22:14:13 UTC (rev 3356)
@@ -1,3 +1,8 @@
+2007-11-05 Michael Lauer <mickey at 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 at openmoko.org>
* configure.ac: Add dbus(-glib)-1 dependency
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 2007-11-04 19:30:41 UTC (rev 3355)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c 2007-11-04 22:14:13 UTC (rev 3356)
@@ -1,4 +1,3 @@
-/* vim: set sts=4 sw=4 expandtab: */
/* openmoko-panel-battery.c
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
@@ -25,7 +24,7 @@
#include <gtk/gtklabel.h>
#include <dbus/dbus.h>
-
+#include <dbus/dbus-glib-lowlevel.h>
#include <apm.h>
#include <string.h>
#include <time.h>
@@ -103,7 +102,7 @@
timeout (BatteryApplet *applet)
{
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;
// How about g_new0 here?
@@ -156,14 +155,9 @@
t = time( NULL );
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
\ No newline at end of file
More information about the commitlog
mailing list