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. r2185 - in
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu: .
src ([EMAIL PROTECTED])
2. r2186 - trunk/src/host/qemu-neo1973/openmoko
([EMAIL PROTECTED])
3. r2187 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: stefan
Date: 2007-06-06 23:35:30 +0200 (Wed, 06 Jun 2007)
New Revision: 2185
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
Log:
2007-06-06 Stefan Schmidt <[EMAIL PROTECTED]>
* configure.ac:
* src/Makefile.am:
* src/stylusmenu.c:
(moko_stylus_menu_activate_item):
Add launcher startup notification support. Close bug #575
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
2007-06-06 20:57:51 UTC (rev 2184)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/ChangeLog
2007-06-06 21:35:30 UTC (rev 2185)
@@ -1,5 +1,13 @@
2007-06-06 Stefan Schmidt <[EMAIL PROTECTED]>
+ * configure.ac:
+ * src/Makefile.am:
+ * src/stylusmenu.c:
+ (moko_stylus_menu_activate_item):
+ Add launcher startup notification support. Close bug #575
+
+2007-06-06 Stefan Schmidt <[EMAIL PROTECTED]>
+
* src/buttonactions.h:
* src/mokodesktop.c:
* src/mokodesktop.h:
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-06-06 20:57:51 UTC (rev 2184)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/configure.ac
2007-06-06 21:35:30 UTC (rev 2185)
@@ -15,9 +15,15 @@
AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not
installed ***]))
PKG_CHECK_MODULES(LIBMB, libmb,,
AC_MSG_ERROR([matchbox-lib required]))
-LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS"
+PKG_CHECK_MODULES(LIBSN, libstartup-notification-1.0, ,
+ AC_MSG_ERROR([*** Required Startup Notification library not
installed ***]))
+#AC_SUBST(SN_LIBS)
+#AC_SUBST(SN_CFLAGS)
+
+LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS $LIBSN_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS $LIBSN_CFLAGS"
+
# output stuff
AC_OUTPUT([
Makefile
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
2007-06-06 20:57:51 UTC (rev 2184)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
2007-06-06 21:35:30 UTC (rev 2185)
@@ -1,5 +1,5 @@
AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\"
-AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@ @LIBMB_CFLAGS@
+AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@ @LIBMB_CFLAGS@
@LIBSN_CFLAGS@
appletdir = $(libdir)/matchbox-panel/
applet_LTLIBRARIES = libopenmoko-panel-mainmenu.la
@@ -10,7 +10,7 @@
stylusmenu.c \
mokodesktop.c \
mokodesktop_item.c
-libopenmoko_panel_mainmenu_la_LIBADD = @OPENMOKO_LIBS@ @LIBMB_LIBS@
+libopenmoko_panel_mainmenu_la_LIBADD = @OPENMOKO_LIBS@ @LIBMB_LIBS@
@LIBSN_LIBS@
MAINTAINERCLEANFILES = Makefile.in
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
2007-06-06 20:57:51 UTC (rev 2184)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
2007-06-06 21:35:30 UTC (rev 2185)
@@ -20,6 +20,10 @@
#include "stylusmenu.h"
//#include "callbacks.h"
+#define SN_API_NOT_YET_FROZEN 1
+#include <libsn/sn-launcher.h>
+#include <gdk/gdkx.h>
+
static GtkImageMenuItem *moko_build_new_menu_item(const char *icon_name,
const char *icon_path);
static void moko_stylus_menu_activate_item(GtkWidget * widget, void
*user_data);
@@ -150,16 +154,37 @@
static void moko_stylus_menu_activate_item(GtkWidget * widget, void *user_data)
{
MokoDesktopItem *ditem = user_data;
+ char* child = (char *)ditem->data;
+ SnLauncherContext* sn_context;
+ SnDisplay* sn_dpy;
+ Display* display;
+ int screen;
+ pid_t pid = 0;
+
g_debug("item activated: %s", ditem->data);
- switch (fork()) {
+
+ display = gdk_x11_display_get_xdisplay(gtk_widget_get_display (widget));
+ sn_dpy = sn_display_new(display, NULL, NULL);
+
+ screen = gdk_screen_get_number(gtk_widget_get_screen (widget));
+ sn_context = sn_launcher_context_new(sn_dpy, screen);
+ sn_display_unref(sn_dpy);
+
+ sn_launcher_context_set_binary_name(sn_context, child);
+ sn_launcher_context_initiate(sn_context, "openmoko-panel-mainmenu",
child, CurrentTime);
+
+ switch ((pid =fork())) {
case 0:
- mb_exec((char *)ditem->data);
- fprintf(stderr, "exec failed, cleaning up child\n");
+ sn_launcher_context_setup_child_process(sn_context);
+ mb_exec(child);
+ g_warning("Failed to exec %s", child);
exit(1);
case -1:
- fprintf(stderr, "can't fork\n");
+ g_warning("Failed to fork %s", child);
break;
}
+
+ sn_launcher_context_unref(sn_context);
}
void
--- End Message ---
--- Begin Message ---
Author: roh
Date: 2007-06-07 06:24:20 +0200 (Thu, 07 Jun 2007)
New Revision: 2186
Modified:
trunk/src/host/qemu-neo1973/openmoko/env
Log:
make flash.sh of qemu working again after our kernel-image renaming (full
version instead of 2.6-)
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2007-06-06 21:35:30 UTC (rev
2185)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2007-06-07 04:24:20 UTC (rev
2186)
@@ -18,7 +18,7 @@
splash_addr=0x36000000
splash_size=0x5000
-kernel_wildcard="uImage-2.6-*-fic-gta01.bin"
+kernel_wildcard="uImage-2.6.*-fic-gta01.bin"
rootfs_wildcard="openmoko-*.rootfs.jffs2"
uboot_wildcard="u-boot-gta01b*.bin"
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-07 09:59:07 +0200 (Thu, 07 Jun 2007)
New Revision: 2187
Modified:
trunk/src/target/kernel/patches/pcf50633.patch
Log:
fix include file (gta02 rather than gta01) to make it compile when GTA02
support is enabled
Modified: trunk/src/target/kernel/patches/pcf50633.patch
===================================================================
--- trunk/src/target/kernel/patches/pcf50633.patch 2007-06-07 04:24:20 UTC
(rev 2186)
+++ trunk/src/target/kernel/patches/pcf50633.patch 2007-06-07 07:59:07 UTC
(rev 2187)
@@ -85,7 +85,7 @@
+#include <linux/apm-emulation.h>
+
+#include <asm/mach-types.h>
-+#include <asm/arch/gta01.h>
++#include <asm/arch/gta02.h>
+
+#include "pcf50633.h"
+
@@ -857,7 +857,7 @@
+ * Charger Control
+ ***********************************************************************/
+
-+/* Enable/disable fast charging (500mA in the GTA01) */
++/* Enable/disable fast charging (500mA in the GTA02) */
+void pcf50633_charge_fast(struct pcf50633_data *pcf, int on)
+{
+#if 0
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
