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. r3346 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb: .
src ([EMAIL PROTECTED])
2. r3347 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
3. r3348 - in trunk/src/target/OM-2007.2/daemons/neod: . src
([EMAIL PROTECTED])
4. r3349 -
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui
([EMAIL PROTECTED])
5. r3350 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
6. r3351 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
7. r3352 - in
trunk/src/target/OM-2007.2/applications/openmoko-terminal2: .
data ([EMAIL PROTECTED])
8. r3353 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-11-04 16:31:08 +0100 (Sun, 04 Nov 2007)
New Revision: 3346
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
Log:
openmoko-panel-usb: hide USB applet initially
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
2007-11-03 13:34:59 UTC (rev 3345)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
2007-11-04 15:31:08 UTC (rev 3346)
@@ -1,3 +1,13 @@
+2007-11-04 Michael Lauer <[EMAIL PROTECTED]>
+
+ * src/openmoko-panel-usb.c: hide USB applet initially
+
+2007-11-02 Michael Lauer <[EMAIL PROTECTED]
+
+ * configure.ac:
+ Remove libusb dependency, add dbus(-glib)-1 dependency
+ * src/openmoko-panel-usb.c: Listen for USB insertion events from dbus
+
2007-10-29 Michael Lauer <[EMAIL PROTECTED]>
* configure.ac:
@@ -2,8 +12,8 @@
Depend on libusb
- * src/openmoko-panel-usb:
+ * src/openmoko-panel-usb.c:
Add usb debug code.
2007-09-02 Michael Lauer <[EMAIL PROTECTED]>
- * src/openmoko-panel-usb:
+ * src/openmoko-panel-usb.c:
Use moko_panel_applet_set_icon to set the icon.
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-03 13:34:59 UTC (rev 3345)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/src/openmoko-panel-usb.c
2007-11-04 15:31:08 UTC (rev 3346)
@@ -17,44 +17,47 @@
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
#include <gtk/gtkimage.h>
#include <time.h>
typedef struct {
- MokoPanelApplet* mpa;
+ MokoPanelApplet* mokopanelapplet;
int dummy;
} UsbApplet;
-static void
-usb_applet_free (UsbApplet *applet)
+static void usb_applet_update_status( UsbApplet* applet, gboolean connected );
+
+#if 0 // not supported yet by Matchbox-Panel-2
+static void usb_applet_free (UsbApplet *applet)
{
g_slice_free (UsbApplet, applet);
}
+#endif
-static void usb_applet_dbus_signal( void* data )
-{
- g_debug( "usb_applet_dbus_signal: received signal. data pointer = %p",
data );
-}
+#define CHARGER_DBUS_SERVICE "org.freedesktop.PowerManagement"
+#define CHARGER_DBUS_PATH "/org/freedesktop/PowerManagement"
+#define CHARGER_DBUS_INTERFACE "org.freedesktop.PowerManagement"
-#define USB_DBUS_SERVICE "org.freedesktop.PowerManagement"
-#define USB_DBUS_PATH "/org/freedesktop/PowerManagement"
-#define USB_DBUS_INTERFACE "org.freedesktop.PowerManagement"
-
DBusHandlerResult signal_filter (DBusConnection *bus, DBusMessage *msg, void
*user_data)
{
+ UsbApplet* applet = (UsbApplet*) user_data;
+
g_debug( "signal_filter" );
- if ( dbus_message_is_signal( msg, USB_DBUS_INTERFACE, "ChargerConnected" )
)
+ if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE,
"ChargerConnected" ) )
{
g_debug( "connected" );
+ usb_applet_update_status( applet, TRUE );
return DBUS_HANDLER_RESULT_HANDLED;
}
- else if ( dbus_message_is_signal( msg, USB_DBUS_INTERFACE,
"ChargerDisconnected" ) )
+ else if ( dbus_message_is_signal( msg, CHARGER_DBUS_INTERFACE,
"ChargerDisconnected" ) )
{
g_debug( "disconnected" );
+ usb_applet_update_status( applet, FALSE );
return DBUS_HANDLER_RESULT_HANDLED;
}
- g_debug( "(unknown dbus message, ignoring" );
+ g_debug( "(unknown dbus message, ignoring)" );
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
@@ -78,31 +81,37 @@
dbus_connection_setup_with_g_main (bus, NULL);
dbus_bus_add_match (bus, "type='signal'", &error);
- dbus_connection_add_filter (bus, signal_filter, NULL, NULL);
+ dbus_connection_add_filter (bus, signal_filter, applet, NULL);
}
-static void usb_applet_update_status( UsbApplet* applet )
+static void usb_applet_update_status( UsbApplet* applet, gboolean connected )
{
- moko_panel_applet_set_icon( applet->mpa, PKGDATADIR "/Usb.png" );
+ g_debug( "usb_applet_update_status: connected = %d", connected );
+ if ( connected )
+ gtk_widget_show( GTK_WIDGET(applet->mokopanelapplet) );
+ else
+ gtk_widget_hide( GTK_WIDGET(applet->mokopanelapplet) );
+}
+gboolean usb_applet_initial_update_status_cb( UsbApplet* applet )
+{
+ usb_applet_update_status( applet, FALSE );
+ return FALSE;
}
G_MODULE_EXPORT GtkWidget*
mb_panel_applet_create(const char* id, GtkOrientation orientation)
{
- MokoPanelApplet* mokoapplet = moko_panel_applet_new();
+ MokoPanelApplet* mokoapplet = MOKO_PANEL_APPLET(moko_panel_applet_new());
UsbApplet *applet;
- time_t t;
- struct tm *local_time;
-
applet = g_slice_new( UsbApplet );
- applet->mpa = mokoapplet;
+ applet->mokopanelapplet = mokoapplet;
usb_applet_init_dbus( applet );
- usb_applet_update_status( applet );
-
- gtk_widget_show_all( GTK_WIDGET(mokoapplet) );
+ moko_panel_applet_set_icon( applet->mokopanelapplet, PKGDATADIR "/Usb.png"
);
+ gtk_widget_show_all( mokoapplet );
+ g_idle_add( (GSourceFunc) usb_applet_initial_update_status_cb, applet );
return GTK_WIDGET(mokoapplet);
};
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 16:45:41 +0100 (Sun, 04 Nov 2007)
New Revision: 3347
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod:
* fix popup menu positioning when screen has been rotated (closes #964), patch
by Kristian Mueller: Thanks!
* do not attempt to close the today window, no matter its title (closes #972),
patch by Kristian Mueller: Thanks!
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
15:31:08 UTC (rev 3346)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-11-04
15:45:41 UTC (rev 3347)
@@ -176,6 +176,30 @@
return ret;
}
+/* Checks if type property of @window is "desktop window" */
+gboolean is_desktop_window( Window window )
+{
+ unsigned long nitems, bytesafter;
+ Atom *window_type = NULL;
+ Atom actual_type;
+ int actual_format;
+
+ Display* display = XOpenDisplay( NULL );
+
+ /* not using gdk_property_get() here, due to note at
+ *
http://www.gtk.org/api/2.6/gdk/gdk-Properties-and-Atoms.html#gdk-property-get
+ */
+ XGetWindowProperty(display, window,
+ gdk_x11_get_xatom_by_name("_NET_WM_WINDOW_TYPE"), 0, 1, False,
+ XA_ATOM, &actual_type, &actual_format, &nitems, &bytesafter,
+ (unsigned char **) &window_type);
+
+ if (strcmp(XGetAtomName(display, *window_type),
"_NET_WM_WINDOW_TYPE_DESKTOP") == 0)
+ return TRUE;
+
+ return FALSE;
+}
+
gboolean neod_buttonactions_install_watcher()
{
int i = 0;
@@ -438,15 +462,22 @@
gtk_widget_size_request( GTK_WIDGET(menu), &req );
gint screen_width = gdk_screen_width();
gint screen_height = gdk_screen_height();
+ gboolean landscape_mode = gdk_screen_width() >= gdk_screen_height();
if ( GTK_WIDGET(menu) == aux_menu )
{
- *x = 0;
+ if (landscape_mode)
+ *x = screen_width - req.width;
+ else
+ *x = 0;
*y = 0;
}
else if ( GTK_WIDGET(menu) == power_menu )
{
- *x = screen_width - req.width;
+ if (landscape_mode)
+ *x = 0;
+ else
+ *x = screen_width - req.width;
*y = screen_height - req.height;
}
else
@@ -462,12 +493,6 @@
const char* title = get_text_property( xwindow,
gdk_x11_get_xatom_by_name("_NET_WM_NAME") );
g_debug( "active Window = %d ('%s')", (int) xwindow, title );
- if ( strcmp( "Today", title ) == 0 )
- {
- g_debug( "sorry, i'm not going to fullscreen the today window" );
- return;
- }
-
Display* display = XOpenDisplay( NULL );
XEvent xev;
@@ -667,7 +692,7 @@
const char* title = get_text_property( xwindow,
gdk_x11_get_xatom_by_name("_NET_WM_NAME") );
g_debug( "active Window = %d ('%s')", (int) xwindow, title );
- if ( strcmp( "Today", title ) == 0 )
+ if ( is_desktop_window(xwindow) )
{
g_debug( "sorry, i'm not going to close the today window" );
return;
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 16:59:52 +0100 (Sun, 04 Nov 2007)
New Revision: 3348
Modified:
trunk/src/target/OM-2007.2/daemons/neod/configure.ac
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: add rudimentary support for HTC and iPAQ devices (from OE)
Modified: trunk/src/target/OM-2007.2/daemons/neod/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/configure.ac 2007-11-04
15:45:41 UTC (rev 3347)
+++ trunk/src/target/OM-2007.2/daemons/neod/configure.ac 2007-11-04
15:59:52 UTC (rev 3348)
@@ -32,6 +32,14 @@
NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
fi
+if test x"$neod_platform" = x"htc"; then
+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
+fi
+
+if test x"$neod_platform" = x"ipaq"; then
+ NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
+fi
+
CFLAGS=$NEOD_CFLAGS
AC_OUTPUT([
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
15:45:41 UTC (rev 3347)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-11-04
15:59:52 UTC (rev 3348)
@@ -60,6 +60,18 @@
#define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
#endif
+#ifdef NEOD_PLATFORM_HTC
+ #define AUX_BUTTON_KEYCODE 0xd4 /* camera */
+ #define POWER_BUTTON_KEYCODE 0x74 /* power */
+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+#endif
+
+#ifdef NEOD_PLATFORM_IPAQ
+ #define AUX_BUTTON_KEYCODE 89 /* _KEY_RECORD */
+ #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
+ #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+#endif
+
#define HEADPHONE_INSERTION_SWITCHCODE 0x02
#define CHARGER_INSERTION_BUTTON 0xa4
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 17:09:16 +0100 (Sun, 04 Nov 2007)
New Revision: 3349
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
Log:
libmokopanelui2: silence debug output
Modified:
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
2007-11-04 15:59:52 UTC (rev 3348)
+++
trunk/src/target/OM-2007.2/libraries/libmokopanelui2/libmokopanelui/moko-panel-applet.c
2007-11-04 16:09:16 UTC (rev 3349)
@@ -22,7 +22,7 @@
#include <gtk/gtkmenu.h>
#undef DEBUG_THIS_FILE
-#define DEBUG_THIS_FILE
+//#define DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
@@ -203,7 +203,7 @@
if ( priv->filename_for_icon )
{
- g_debug( "moko_panel_applet_iconadd_cb:'%s' (%p)",
priv->filename_for_icon, priv->filename_for_icon );
+ moko_debug( "moko_panel_applet_iconadd_cb:'%s' (%p)",
priv->filename_for_icon, priv->filename_for_icon );
mb_panel_scaling_image_set_icon( MB_PANEL_SCALING_IMAGE(self->icon),
priv->filename_for_icon );
g_free( priv->filename_for_icon );
priv->filename_for_icon = 0;
@@ -216,7 +216,7 @@
////////////////
void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename)
{
- g_debug( "moko_panel_applet_set_icon:'%s' (%p)", filename, filename );
+ moko_debug( "moko_panel_applet_set_icon:'%s' (%p)", filename, filename );
MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
if ( !self->icon )
{
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 18:46:06 +0100 (Sun, 04 Nov 2007)
New Revision: 3350
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h
trunk/src/target/OM-2007.2/daemons/neod/src/neod-main.c
Log:
neod: check initial charger status on startup and send via dbus
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
16:09:16 UTC (rev 3349)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-11-04
17:46:06 UTC (rev 3350)
@@ -20,6 +20,7 @@
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtkseparatormenuitem.h>
#include <gdk/gdkx.h>
@@ -75,6 +76,12 @@
#define HEADPHONE_INSERTION_SWITCHCODE 0x02
#define CHARGER_INSERTION_BUTTON 0xa4
+#define BIT_MASK( name, numbits ) \
+ unsigned short name[ ((numbits) - 1) / (sizeof( short ) * 8) + 1 ]; \
+ memset( name, 0, sizeof( name ) )
+#define BIT_TEST( bitmask, bit ) \
+ ( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) *
8))) )
+
GPollFD input_fd[10];
int max_input_fd = 0;
@@ -498,7 +505,7 @@
void neod_buttonactions_popup_selected_fullscreen( GtkMenuItem* menu, gpointer
user_data )
{
- static is_fullscreen = 0;
+ static int is_fullscreen = 0;
gtk_widget_hide( aux_menu );
Window xwindow = get_window_property( gdk_x11_get_default_root_xwindow(),
gdk_x11_get_xatom_by_name("_NET_ACTIVE_WINDOW") );
@@ -707,7 +714,7 @@
if ( is_desktop_window(xwindow) )
{
g_debug( "sorry, i'm not going to close the today window" );
- return;
+ return FALSE;
}
Display* display = XOpenDisplay( NULL );
@@ -830,7 +837,7 @@
gboolean neod_buttonactions_powersave_timeout3( guint timeout )
{
if ( pm_value != FULL )
- return;
+ return FALSE;
g_debug( "mainmenu powersave timeout 3" );
//FIXME talk to neod
power_state = SUSPEND;
@@ -890,3 +897,38 @@
}
+gboolean neod_buttonactions_initial_update()
+{
+ g_debug( "neod_buttonactions_initial_update" );
+ for ( int i = 0; i <= max_input_fd; ++i )
+ {
+ char name[256] = "Unknown";
+ if( ioctl( input_fd[i].fd, EVIOCGNAME(sizeof(name)), name ) < 0)
+ {
+ perror("evdev ioctl");
+ continue;
+ }
+
+ g_debug( "input node %d corresponds to %s", i, name );
+
+ BIT_MASK( keys, KEY_MAX );
+ if( ioctl( input_fd[i].fd, EVIOCGKEY(sizeof(keys)), keys ) < 0)
+ {
+ perror("evdev ioctl");
+ continue;
+ }
+
+ if ( BIT_TEST( keys, CHARGER_INSERTION_BUTTON ) )
+ {
+ g_debug( "charger already inserted" );
+ g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freesmartphone.powermanagement.ChargerConnected", NULL );
+ }
+ else
+ {
+ g_debug( "charger not yet inserted" );
+ g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freesmartphone.powermanagement.ChargerDisconnected", NULL );
+ }
+ }
+
+ return FALSE;
+}
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h 2007-11-04
16:09:16 UTC (rev 3349)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.h 2007-11-04
17:46:06 UTC (rev 3350)
@@ -40,5 +40,6 @@
void neod_buttonactions_sound_init();
void neod_buttonactions_set_display( int brightness );
void neod_buttonactions_sound_play( const gchar* samplename );
+gboolean neod_buttonactions_initial_update();
#endif
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/neod-main.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/neod-main.c 2007-11-04
16:09:16 UTC (rev 3349)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/neod-main.c 2007-11-04
17:46:06 UTC (rev 3350)
@@ -26,6 +26,7 @@
neod_buttonactions_powersave_reset();
neod_buttonactions_set_display( 100 );
neod_buttonactions_sound_init();
+ g_timeout_add_seconds( 10, (GSourceFunc)
neod_buttonactions_initial_update, NULL );
gtk_main();
return 0;
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 19:05:13 +0100 (Sun, 04 Nov 2007)
New Revision: 3351
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: only check PMU event status input node on startup
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
17:46:06 UTC (rev 3350)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-11-04
18:05:13 UTC (rev 3351)
@@ -366,12 +366,12 @@
{
g_debug( "charger IN" );
neod_buttonactions_sound_play( "touchscreen" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freesmartphone.powermanagement.ChargerConnected", NULL );
+ g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerConnected", NULL );
}
else if ( event.value == 0 ) /* released */
{
g_debug( "charger OUT" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freesmartphone.powermanagement.ChargerDisconnected", NULL );
+ g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerDisconnected", NULL );
}
neod_buttonactions_powersave_reset();
if ( power_state != NORMAL )
@@ -911,6 +911,9 @@
g_debug( "input node %d corresponds to %s", i, name );
+ if ( strcmp( name, "FIC Neo1973 PMU events" ) != 0 )
+ continue;
+
BIT_MASK( keys, KEY_MAX );
if( ioctl( input_fd[i].fd, EVIOCGKEY(sizeof(keys)), keys ) < 0)
{
@@ -921,12 +924,12 @@
if ( BIT_TEST( keys, CHARGER_INSERTION_BUTTON ) )
{
g_debug( "charger already inserted" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freesmartphone.powermanagement.ChargerConnected", NULL );
+ g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerConnected", NULL );
}
else
{
g_debug( "charger not yet inserted" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freesmartphone.powermanagement.ChargerDisconnected", NULL );
+ g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerDisconnected", NULL );
}
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 19:11:35 +0100 (Sun, 04 Nov 2007)
New Revision: 3352
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/openmoko-terminal.desktop
Log:
openmoko-terminal2: This application is not part of the PIM suite
Modified: trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
2007-11-04 18:05:13 UTC (rev 3351)
+++ trunk/src/target/OM-2007.2/applications/openmoko-terminal2/ChangeLog
2007-11-04 18:11:35 UTC (rev 3352)
@@ -1,3 +1,7 @@
+2007-11-05 Michael Lauer <[EMAIL PROTECTED]>
+
+ * data/openmoko-terminal.desktop: terminal is not a PIM application
+
2007-09-14 Michael Lauer <[EMAIL PROTECTED]>
* src/moko-terminal.c: Set default font spec to "LiberationMono 5"
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/openmoko-terminal.desktop
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/openmoko-terminal.desktop
2007-11-04 18:05:13 UTC (rev 3351)
+++
trunk/src/target/OM-2007.2/applications/openmoko-terminal2/data/openmoko-terminal.desktop
2007-11-04 18:11:35 UTC (rev 3352)
@@ -6,7 +6,7 @@
Icon=openmoko-terminal
Terminal=false
Type=Application
-Categories=GTK;Application;PIM;Office
+Categories=GTK;Application;Utilities
MimeType=text/x-vcard;
SingleInstance=true
StartupNotify=true
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-04 20:30:04 +0100 (Sun, 04 Nov 2007)
New Revision: 3353
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: send notifications over dbus system bus (not session bus), fix signal
names
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
18:11:35 UTC (rev 3352)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-11-04
19:30:04 UTC (rev 3353)
@@ -366,12 +366,12 @@
{
g_debug( "charger IN" );
neod_buttonactions_sound_play( "touchscreen" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerConnected", NULL );
+ g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerConnected", NULL );
}
else if ( event.value == 0 ) /* released */
{
g_debug( "charger OUT" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerDisconnected", NULL );
+ g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerDisconnected", NULL );
}
neod_buttonactions_powersave_reset();
if ( power_state != NORMAL )
@@ -924,12 +924,12 @@
if ( BIT_TEST( keys, CHARGER_INSERTION_BUTTON ) )
{
g_debug( "charger already inserted" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerConnected", NULL );
+ g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerConnected", NULL );
}
else
{
g_debug( "charger not yet inserted" );
- g_spawn_command_line_async( "dbus-send
/org/freedesktop/PowerManagement
org.freedesktop.powermanagement.ChargerDisconnected", NULL );
+ g_spawn_command_line_async( "dbus-send --system
/org/freedesktop/PowerManagement
org.freedesktop.PowerManagement.ChargerDisconnected", NULL );
}
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
