Send commitlog mailing list submissions to
[email protected]
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. r3354 -
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src
([EMAIL PROTECTED])
2. r3355 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery:
. src ([EMAIL PROTECTED])
3. r3356 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery:
. src ([EMAIL PROTECTED])
4. r3357 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-11-04 20:30:27 +0100 (Sun, 04 Nov 2007)
New Revision: 3354
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
Log:
openmoko-panel-usb: dbus session bus
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
2007-11-04 19:30:04 UTC (rev 3353)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
2007-11-04 19:30:27 UTC (rev 3354)
@@ -66,8 +66,8 @@
DBusError error;
dbus_error_init (&error);
- /* Get a connection to the session bus */
- DBusConnection* bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
+ /* Get a connection to the system bus */
+ DBusConnection* bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
if (!bus)
{
gchar buffer[100];
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 20:30:41 +0100 (Sun, 04 Nov 2007)
New Revision: 3355
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/src/openmoko-panel-battery.c
Log:
openmoko-panel-battery: dbus system bus
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:27 UTC (rev 3354)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
2007-11-04 19:30:41 UTC (rev 3355)
@@ -1,3 +1,9 @@
+2007-11-02 Michael Lauer <[EMAIL PROTECTED]>
+
+ * configure.ac: Add dbus(-glib)-1 dependency
+ * src/openmoko-panel-battery.c:
+ (battery_panel_dbus_init): Listen to dbus for charger insertion/removal
events.
+
2007-10-25 Thomas Wood <[EMAIL PROTECTED]>
* src/openmoko-panel-battery.c: (timeout),
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
2007-11-04 19:30:27 UTC (rev 3354)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
2007-11-04 19:30:41 UTC (rev 3355)
@@ -11,7 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2 dbus-1 dbus-glib-1)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
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:27 UTC (rev 3354)
+++
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)
@@ -24,6 +24,7 @@
#include <libmokopanelui2/moko-panel-applet.h>
#include <gtk/gtklabel.h>
+#include <dbus/dbus.h>
#include <apm.h>
#include <string.h>
@@ -36,6 +37,9 @@
guint timeout_id;
} BatteryApplet;
+static gboolean
+timeout (BatteryApplet *applet);
+
/* applets cannot be unloaded yet */
#if 0
static void
@@ -46,7 +50,55 @@
}
#endif
-/* Called every 5 minutes */
+#define CHARGER_DBUS_SERVICE "org.freedesktop.PowerManagement"
+#define CHARGER_DBUS_PATH "/org/freedesktop/PowerManagement"
+#define CHARGER_DBUS_INTERFACE "org.freedesktop.PowerManagement"
+
+DBusHandlerResult signal_filter (DBusConnection *bus, DBusMessage *msg, void
*user_data)
+{
+ g_debug( "signal_filter" );
+ if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE,
"ChargerConnected" ) )
+ {
+ g_debug( "connected" );
+ timeout( user_data );
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
+ else if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE,
"ChargerDisconnected" ) )
+ {
+ g_debug( "disconnected" );
+ timeout( user_data );
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
+
+ g_debug( "(unknown dbus message, ignoring)" );
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static void battery_applet_init_dbus( BatteryApplet* applet )
+{
+ DBusError error;
+ dbus_error_init (&error);
+
+ /* Get a connection to the system bus */
+ DBusConnection* bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+ if (!bus)
+ {
+ gchar buffer[100];
+ sprintf (buffer, "Failed to connect to the D-BUS daemon: %s",
error.message);
+ g_critical (buffer);
+ dbus_error_free (&error);
+ return ;
+ }
+ g_debug("Connection to bus successfully made");
+
+ dbus_connection_setup_with_g_main (bus, NULL);
+
+ dbus_bus_add_match (bus, "type='signal'", &error);
+ dbus_connection_add_filter (bus, signal_filter, applet, NULL);
+}
+
+
+/* Called frequently */
static gboolean
timeout (BatteryApplet *applet)
{
@@ -104,15 +156,14 @@
t = time( NULL );
local_time = localtime(&t);
- //FIXME Add source watching for charger insertion event on
/dev/input/event1
+ 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);
- timeout(applet);
-
- moko_panel_applet_set_icon( mokoapplet, PKGDATADIR "/Battery_00.png" );
+ moko_panel_applet_set_icon( applet->mokoapplet, icon ); // initial status
= unknown
gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
return GTK_WIDGET(mokoapplet);
}
+22
\ No newline at end of file
--- End Message ---
--- Begin Message ---
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 <[EMAIL PROTECTED]>
+
+ * src/openmoko-panel-battery.c: Use g_timeout_add_seconds.
+ Note that we now require glib >= 2.14
+
2007-11-02 Michael Lauer <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
@@ -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
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-05 11:15:10 +0100 (Mon, 05 Nov 2007)
New Revision: 3357
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: add workaround for gathering the initial KEY_BATTERY status
until OM bug #991 has been fixed
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2007-11-04
22:14:13 UTC (rev 3356)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2007-11-05
10:15:10 UTC (rev 3357)
@@ -12,7 +12,7 @@
buttonactions.c \
neod-main.c
-neod_LDADD = @NEOD_LIBS@
+neod_LDADD = @NEOD_LIBS@ -lapm
MAINTAINERCLEANFILES = config.h.in Makefile.in
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-11-04
22:14:13 UTC (rev 3356)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-11-05
10:15:10 UTC (rev 3357)
@@ -40,6 +40,8 @@
#include <sys/stat.h>
#include <linux/input.h>
+#include <apm.h>
+
#define SYS_CLASS_BACKLIGHT "/sys/class/backlight/"
static gchar* backlight_node = NULL;
@@ -899,7 +901,10 @@
gboolean neod_buttonactions_initial_update()
{
+ // need a workaround until OM bug #991 has been fixed
+ // http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=991
g_debug( "neod_buttonactions_initial_update" );
+#ifdef BUG_991_FIXED
for ( int i = 0; i <= max_input_fd; ++i )
{
char name[256] = "Unknown";
@@ -922,6 +927,12 @@
}
if ( BIT_TEST( keys, CHARGER_INSERTION_BUTTON ) )
+#else
+ apm_info info;
+ memset (&info, 0, sizeof (apm_info));
+ apm_read (&info);
+ if ( info.battery_status == BATTERY_STATUS_CHARGING )
+#endif
{
g_debug( "charger already inserted" );
g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerConnected", NULL );
@@ -931,7 +942,9 @@
g_debug( "charger not yet inserted" );
g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerDisconnected", NULL );
}
+#ifdef BUG_991_FIXED
}
+#endif
return FALSE;
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
