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. r2114 - in
trunk/src/target/OM-2007/applications/openmoko-today: . src
([EMAIL PROTECTED])
2. r2115 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r2116 - in trunk/oe: conf/distro/include packages
packages/matchbox-desktop-2 packages/tasks ([EMAIL PROTECTED])
4. r2117 - trunk/oe/conf ([EMAIL PROTECTED])
5. r2118 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
6. r2119 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
7. r2120 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-06-01 17:54:56 +0200 (Fri, 01 Jun 2007)
New Revision: 2114
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
Log:
2007-06-01 Thomas Wood <[EMAIL PROTECTED]>
* src/today-main.c: (network_register_cb), (create_ui), (main): Add
MokoGsmdConnection object
Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-06-01 07:47:16 UTC (rev 2113)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-06-01 15:54:56 UTC (rev 2114)
@@ -1,3 +1,13 @@
+2007-06-01 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/today-main.c: (network_register_cb), (create_ui), (main): Add
MokoGsmdConnection object
+
+2007-06-01 Thomas Wood <[EMAIL PROTECTED]>
+
+ reviewed by: <delete if not using a buddy>
+
+ * src/today-main.c: (network_register_cb), (create_ui), (main):
+
2007-05-31 Thomas Wood <[EMAIL PROTECTED]>
* src/today-main.c: (today_update_date), (today_infoline_new),
Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
2007-06-01 07:47:16 UTC (rev 2113)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
2007-06-01 15:54:56 UTC (rev 2114)
@@ -32,6 +32,7 @@
#include <libsn/sn-launcher.h>
#include <gdk/gdkx.h>
+#include <libmokogsmd/moko-gsmd-connection.h>
#include "today-events-area.h"
#include "today-utils.h"
#include "xutil.h"
@@ -85,6 +86,14 @@
}
+static void
+network_register_cb (MokoGsmdConnection* self, int type, int lac, int cell,
GtkLabel *label)
+{
+ // TODO: get operator name somehow?
+ // update label with operator name
+ //gtk_label_set_markup (label, "<span size=\"x-large\">%s</span>",
operator_name);
+}
+
/* information lines */
static void
@@ -327,7 +336,11 @@
g_signal_connect (G_OBJECT (window), "delete-event",
(GCallback) gtk_main_quit, NULL);
+ /* set up connection management */
+ MokoGsmdConnection *connection = moko_gsmd_connection_new ();
+ g_signal_connect (G_OBJECT (connection), "network-registration",
network_register_cb, message);
+
gtk_widget_show_all (window);
}
@@ -348,6 +361,8 @@
/* create the UI and run */
create_ui ();
+
+
gtk_main ();
return 0;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-01 23:41:54 +0200 (Fri, 01 Jun 2007)
New Revision: 2115
Modified:
trunk/src/target/kernel/patches/gta01-backlight.patch
Log:
fix GTA01 backlight driver / 2.6.21.x kernel API
Modified: trunk/src/target/kernel/patches/gta01-backlight.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-backlight.patch 2007-06-01
15:54:56 UTC (rev 2114)
+++ trunk/src/target/kernel/patches/gta01-backlight.patch 2007-06-01
21:41:54 UTC (rev 2115)
@@ -1,9 +1,9 @@
This is a backlight driver for FIC's Neo1973 Phone (codename GTA01)
-Index: linux-2.6.21-moko/drivers/video/backlight/Kconfig
+Index: linux-2.6.21.3-moko/drivers/video/backlight/Kconfig
===================================================================
---- linux-2.6.21-moko.orig/drivers/video/backlight/Kconfig
-+++ linux-2.6.21-moko/drivers/video/backlight/Kconfig
+--- linux-2.6.21.3-moko.orig/drivers/video/backlight/Kconfig
++++ linux-2.6.21.3-moko/drivers/video/backlight/Kconfig
@@ -48,6 +48,14 @@
If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y
to
enable the LCD/backlight driver.
@@ -19,10 +19,10 @@
config BACKLIGHT_HP680
tristate "HP Jornada 680 Backlight Driver"
depends on BACKLIGHT_CLASS_DEVICE && SH_HP6XX
-Index: linux-2.6.21-moko/drivers/video/backlight/Makefile
+Index: linux-2.6.21.3-moko/drivers/video/backlight/Makefile
===================================================================
---- linux-2.6.21-moko.orig/drivers/video/backlight/Makefile
-+++ linux-2.6.21-moko/drivers/video/backlight/Makefile
+--- linux-2.6.21.3-moko.orig/drivers/video/backlight/Makefile
++++ linux-2.6.21.3-moko/drivers/video/backlight/Makefile
@@ -3,6 +3,7 @@
obj-$(CONFIG_LCD_CLASS_DEVICE) += lcd.o
obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
@@ -31,11 +31,11 @@
obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o
obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
-Index: linux-2.6.21-moko/drivers/video/backlight/gta01_bl.c
+Index: linux-2.6.21.3-moko/drivers/video/backlight/gta01_bl.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,286 @@
++++ linux-2.6.21.3-moko/drivers/video/backlight/gta01_bl.c
+@@ -0,0 +1,288 @@
+/*
+ * Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
+ *
@@ -267,6 +267,8 @@
+
+ gta01bl_prop.power = FB_BLANK_UNBLANK;
+ gta01bl_prop.brightness = gta01bl_prop.max_brightness;
++ memcpy(>a01_backlight_device->props,
++ >a01bl_prop, sizeof(gta01bl_prop));
+ gta01bl_send_intensity(gta01_backlight_device);
+
+ printk("GTA01 Backlight Driver Initialized.\n");
--- End Message ---
--- Begin Message ---
Author: stefan
Date: 2007-06-01 23:51:27 +0200 (Fri, 01 Jun 2007)
New Revision: 2116
Added:
trunk/oe/packages/matchbox-desktop-2/
trunk/oe/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
Modified:
trunk/oe/conf/distro/include/sane-srcdates.inc
trunk/oe/packages/tasks/task-openmoko.bb
Log:
* matchbox-desktop-2 recipe from poky
* Use matchbox-desktop-2 instead of matchbox-desktop
Modified: trunk/oe/conf/distro/include/sane-srcdates.inc
===================================================================
--- trunk/oe/conf/distro/include/sane-srcdates.inc 2007-06-01 21:41:54 UTC
(rev 2115)
+++ trunk/oe/conf/distro/include/sane-srcdates.inc 2007-06-01 21:51:27 UTC
(rev 2116)
@@ -26,6 +26,7 @@
SRCDATE_matchbox-common ?= "20060612"
SRCDATE_matchbox-config-gtk ?= "20060612"
SRCDATE_matchbox-desktop ?= "20060612"
+SRCDATE_matchbox-desktop-2 ?= "20070528"
SRCDATE_matchbox-keyboard ?= "20060612"
SRCDATE_matchbox-panel ?= "20060612"
SRCDATE_matchbox-panel-2 ?= "20070415"
Added: trunk/oe/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
===================================================================
--- trunk/oe/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
2007-06-01 21:41:54 UTC (rev 2115)
+++ trunk/oe/packages/matchbox-desktop-2/matchbox-desktop-2_svn.bb
2007-06-01 21:51:27 UTC (rev 2116)
@@ -0,0 +1,20 @@
+DESCRIPTION = "Matchbox Window Manager Desktop"
+LICENSE = "GPL"
+DEPENDS = "gtk+ startup-notification"
+RDEPENDS = "matchbox-common"
+SECTION = "x11/wm"
+PV = "0.0+svn${SRCDATE}"
+PR = "r1"
+
+PROVIDES_${PN} = matchbox-desktop
+RPROVIDES_${PN} = matchbox-desktop
+RREPLACES_${PN} = matchbox-desktop
+RCONFLICTS_${PN} = matchbox-desktop
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
+
+EXTRA_OECONF = "--enable-startup-notification"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-06-01 21:41:54 UTC (rev
2115)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-06-01 21:51:27 UTC (rev
2116)
@@ -152,7 +152,7 @@
#
DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications"
RDEPENDS_task-openmoko-demo = "\
- matchbox-desktop \
+ matchbox-desktop-2 \
matchbox-keyboard \
matchbox-stroke \
matchbox-config-gtk \
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-06-02 00:26:57 +0200 (Sat, 02 Jun 2007)
New Revision: 2117
Modified:
trunk/oe/conf/site.conf
Log:
revert inadvertent change from svn commit 1612. this caused builds on hosts !=
buildhost to build packages from the wrong repository
Modified: trunk/oe/conf/site.conf
===================================================================
--- trunk/oe/conf/site.conf 2007-06-01 21:51:27 UTC (rev 2116)
+++ trunk/oe/conf/site.conf 2007-06-01 22:26:57 UTC (rev 2117)
@@ -2,6 +2,11 @@
DL_DIR = "${OMDIR}/sources"
BBFILES := "${OMDIR}/openembedded/packages/*/*.bb ${OMDIR}/oe/packages/*/*.bb"
+BBFILE_COLLECTIONS = "upstream local"
+BBFILE_PATTERN_upstream = "^${OMDIR}/openembedded/"
+BBFILE_PATTERN_local = "^${OMDIR}/oe/"
+BBFILE_PRIORITY_upstream = "5"
+BBFILE_PRIORITY_local = "10"
BBINCLUDELOGS = "yes"
KERNEL_CONSOLE = "tty1"
#DEBUG_OPTIMIZATION = "-O -g3"
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-02 01:07:41 +0200 (Sat, 02 Jun 2007)
New Revision: 2118
Modified:
trunk/src/target/kernel/patches/gta01-power_control.patch
Log:
fix bluetooth power-up routine (make sure device reset is used correctly)
Modified: trunk/src/target/kernel/patches/gta01-power_control.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-power_control.patch 2007-06-01
22:26:57 UTC (rev 2117)
+++ trunk/src/target/kernel/patches/gta01-power_control.patch 2007-06-01
23:07:41 UTC (rev 2118)
@@ -1,16 +1,16 @@
-Index: linux-2.6.21-moko/arch/arm/common/Makefile
+Index: linux-2.6.21.3-moko/arch/arm/common/Makefile
===================================================================
---- linux-2.6.21-moko.orig/arch/arm/common/Makefile
-+++ linux-2.6.21-moko/arch/arm/common/Makefile
+--- linux-2.6.21.3-moko.orig/arch/arm/common/Makefile
++++ linux-2.6.21.3-moko/arch/arm/common/Makefile
@@ -17,3 +17,4 @@
obj-$(CONFIG_SHARP_SCOOP) += scoop.o
obj-$(CONFIG_ARCH_IXP2000) += uengine.o
obj-$(CONFIG_ARCH_IXP23XX) += uengine.o
+obj-$(CONFIG_MACH_NEO1973_GTA01)+= gta01_pm_gsm.o gta01_pm_gps.o gta01_pm_bt.o
-Index: linux-2.6.21-moko/arch/arm/common/gta01_pm_gps.c
+Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gps.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/arch/arm/common/gta01_pm_gps.c
++++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gps.c
@@ -0,0 +1,558 @@
+/*
+ * GPS Power Management code for the FIC Neo1973 GSM Phone
@@ -570,10 +570,10 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GPS Power Management");
-Index: linux-2.6.21-moko/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gsm.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/arch/arm/common/gta01_pm_gsm.c
++++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gsm.c
@@ -0,0 +1,217 @@
+/*
+ * GSM Management code for the FIC Neo1973 GSM Phone
@@ -792,11 +792,11 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GSM Management");
-Index: linux-2.6.21-moko/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_bt.c
===================================================================
--- /dev/null
-+++ linux-2.6.21-moko/arch/arm/common/gta01_pm_bt.c
-@@ -0,0 +1,140 @@
++++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_bt.c
+@@ -0,0 +1,154 @@
+/*
+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
+ *
@@ -832,7 +832,7 @@
+ PCF50606_REGULATOR_D1REG) == 3100)
+ goto out_1;
+ } else if (!strcmp(attr->attr.name, "reset")) {
-+ if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN))
++ if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
+ goto out_1;
+ }
+
@@ -847,14 +847,20 @@
+ unsigned long on = simple_strtoul(buf, NULL, 10);
+
+ if (!strcmp(attr->attr.name, "power_on")) {
-+ if (on)
++ /* if we are powering up, assert reset, then power, then
++ * release reset */
++ if (on) {
++ s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
+ pcf50606_voltage_set(pcf50606_global,
+ PCF50606_REGULATOR_D1REG,
+ 3100);
++ }
+ pcf50606_onoff_set(pcf50606_global,
+ PCF50606_REGULATOR_D1REG, on);
++ s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
+ } else if (!strcmp(attr->attr.name, "reset")) {
-+ s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
++ /* reset is low-active, so we need to invert */
++ s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1 );
+ }
+
+ return count;
@@ -867,7 +873,9 @@
+static int gta01_bt_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ dev_info(&pdev->dev, DRVMSG ": suspending\n");
-+ /* FIXME */
++ /* FIXME: The PMU should save the PMU status, and the GPIO code should
++ * preserve the GPIO level, so there shouldn't be anything left to do
++ * for us, should there? */
+
+ return 0;
+}
@@ -875,7 +883,6 @@
+static int gta01_bt_resume(struct platform_device *pdev)
+{
+ dev_info(&pdev->dev, DRVMSG ": resuming\n");
-+ /* FIXME */
+
+ return 0;
+}
@@ -899,6 +906,13 @@
+{
+ dev_info(&pdev->dev, DRVMSG ": starting\n");
+
++ /* we make sure that the voltage is off */
++ pcf50606_onoff_set(pcf50606_global,
++ PCF50606_REGULATOR_D1REG, 0);
++ /* we pull reset to low to make sure that the chip doesn't
++ * drain power through the reset line */
++ s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
++
+ return sysfs_create_group(&pdev->dev.kobj, >a01_bt_attr_group);
+}
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-02 01:49:07 +0200 (Sat, 02 Jun 2007)
New Revision: 2119
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
Log:
use PATH_MAX where apropriate
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.c
2007-06-01 23:07:41 UTC (rev 2118)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.c
2007-06-01 23:49:07 UTC (rev 2119)
@@ -179,9 +179,9 @@
DIR *dp;
struct stat stat_info;
- char vfolder_path_root[512];
- char vfolder_path[512];
- char orig_wd[256];
+ char vfolder_path_root[PATH_MAX];
+ char vfolder_path[PATH_MAX];
+ char orig_wd[PATH_MAX];
int desktops_dirs_n = APP_PATHS_N;
@@ -192,7 +192,7 @@
MokoDesktopItem *item_new = NULL;
MBDotDesktop *dd, *user_overides = NULL;
- char app_paths[APP_PATHS_N][256];
+ char app_paths[APP_PATHS_N][PATH_MAX];
struct dirent **namelist;
/*
top_head_item = mokodesktop_item_new_with_params ("Home",
@@ -202,15 +202,15 @@
*/
ItemTypeDotDesktop = type_reg_cnt;
- snprintf( vfolder_path_root, 512, "%s/.matchbox/vfolders/Root.directory",
+ snprintf( vfolder_path_root, PATH_MAX,
"%s/.matchbox/vfolders/Root.directory",
mb_util_get_homedir());
- snprintf( vfolder_path, 512, "%s/.matchbox/vfolders",
+ snprintf( vfolder_path, PATH_MAX, "%s/.matchbox/vfolders",
mb_util_get_homedir());
if (stat(vfolder_path_root, &stat_info))
{
- snprintf(vfolder_path_root, 512, VFOLDERDIR"/vfolders/Root.directory");
- snprintf(vfolder_path, 512, VFOLDERDIR "/vfolders" );
+ snprintf(vfolder_path_root, PATH_MAX,
VFOLDERDIR"/vfolders/Root.directory");
+ snprintf(vfolder_path, PATH_MAX, VFOLDERDIR "/vfolders" );
}
fprintf(stdout, "moko: vfolder_path_root=[%s]\n", vfolder_path_root);
@@ -248,13 +248,13 @@
}
- //snprintf(app_paths[0], 256, "%s/applications", DATADIR);
- snprintf(app_paths[0], 256, "/usr/share/applications");
- snprintf(app_paths[1], 256, "/usr/share/applications");
- snprintf(app_paths[2], 256, "/usr/local/share/applications");
- snprintf(app_paths[3], 256, "%s/.applications", mb_util_get_homedir());
+ //snprintf(app_paths[0], PATH_MAX-1, "%s/applications", DATADIR);
+ snprintf(app_paths[0], PATH_MAX-1, "/usr/share/applications");
+ snprintf(app_paths[1], PATH_MAX-1, "/usr/share/applications");
+ snprintf(app_paths[2], PATH_MAX-1, "/usr/local/share/applications");
+ snprintf(app_paths[3], PATH_MAX-1, "%s/.applications",
mb_util_get_homedir());
- if (getcwd(orig_wd, 255) == (char *)NULL)
+ if (getcwd(orig_wd, PATH_MAX-1) == (char *)NULL)
{
fprintf(stderr, "Cant get current directory\n");
return -1;
@@ -300,7 +300,7 @@
&& mb_dotdesktop_get(dd, "Exec"))
{
MokoDesktopItem *folder = NULL;
- char full_path[512];
+ char full_path[PATH_MAX];
char *folder_name = NULL;
add_a_dotdesktop_item (top_head_item, dd, folder);
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h
2007-06-01 23:07:41 UTC (rev 2118)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/mokodesktop.h
2007-06-01 23:49:07 UTC (rev 2119)
@@ -8,6 +8,7 @@
#include <fcntl.h>
#include <signal.h>
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/stat.h>
#include <dirent.h>
#include <ctype.h>
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-01 23:07:41 UTC (rev 2118)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
2007-06-01 23:49:07 UTC (rev 2119)
@@ -3,11 +3,11 @@
*
* Authored by Sun Zhiyong <[EMAIL PROTECTED]>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * Copyright (C) 2006-2007 OpenMoko, Inc.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 of the license.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2.0 of the license.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,13 +41,13 @@
}
else
{
- char path[512];
- snprintf (path, 512, "%s/%s", PIXMAP_PATH, item_new->icon_name);
+ char path[PATH_MAX];
+ snprintf (path, PATH_MAX, "%s/%s", PIXMAP_PATH, item_new->icon_name);
if (access (path, 0) == 0)
menu_item = moko_build_new_menu_item (item_new->name, path);
else
{
- snprintf (path, 512, "%s/%s", PKGDATADIR, "default-app-icon.xpm");
+ snprintf (path, PATH_MAX, "%s/%s", PKGDATADIR,
"default-app-icon.xpm");
menu_item = moko_build_new_menu_item (item_new->name, path);
//moko_fill_model(self->list_store, path, item_new->name,
item_new);
}
@@ -69,13 +69,13 @@
}
else
{
- char path[512];
- snprintf (path, 512, "%s/%s", PIXMAP_PATH, tmp_item->icon_name);
+ char path[PATH_MAX];
+ snprintf (path, PATH_MAX, "%s/%s", PIXMAP_PATH, tmp_item->icon_name);
if (access (path, 0) == 0)
menu_item = moko_build_new_menu_item (tmp_item->name, path);
else
{
- snprintf (path, 512, "%s/%s", PKGDATADIR,
"default-app-icon.xpm");
+ snprintf (path, PATH_MAX, "%s/%s", PKGDATADIR,
"default-app-icon.xpm");
menu_item = moko_build_new_menu_item (tmp_item->name, path);
//moko_fill_model(self->list_store, path, item_new->name,
item_new);
}
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-02 02:11:38 +0200 (Sat, 02 Jun 2007)
New Revision: 2120
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
Log:
mainmenu: emergency hacks for:
* making sure the activate callback is called even for toplevel items
* actually executing programs that are selected in menu
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-01 23:49:07 UTC (rev 2119)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/stylusmenu.c
2007-06-02 00:11:38 UTC (rev 2120)
@@ -21,7 +21,7 @@
//#include "callbacks.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, const char*
name);
+static void moko_stylus_menu_activate_item(GtkWidget* widget, void *user_data);
void
moko_stylus_menu_build (GtkMenu *menu, MokoDesktopItem *item)
@@ -54,8 +54,8 @@
}
gtk_menu_shell_append( GTK_MENU_SHELL(menu), GTK_WIDGET(menu_item));
gtk_widget_show (GTK_WIDGET(menu_item));
-
- if (item_new->type == ITEM_TYPE_FOLDER)
+ switch (item_new->type) {
+ case ITEM_TYPE_FOLDER:
{
MokoDesktopItem *tmp_item;
GtkWidget *sub_menu;
@@ -81,14 +81,26 @@
}
}
- if (tmp_item->type == ITEM_TYPE_DOTDESKTOP_ITEM
||tmp_item->type == ITEM_TYPE_APP )
- g_signal_connect (menu_item, "activate"
,G_CALLBACK(moko_stylus_menu_activate_item), tmp_item->data);
+ if (tmp_item->type == ITEM_TYPE_DOTDESKTOP_ITEM ||
+ tmp_item->type == ITEM_TYPE_APP )
+ g_signal_connect(menu_item, "activate" ,
+ G_CALLBACK(moko_stylus_menu_activate_item),
+ tmp_item);
gtk_menu_shell_append( GTK_MENU_SHELL(sub_menu),
GTK_WIDGET(menu_item) );
gtk_widget_show (GTK_WIDGET(menu_item));
}
}
- }
+ break;
+ case ITEM_TYPE_DOTDESKTOP_ITEM:
+ case ITEM_TYPE_APP:
+ g_signal_connect (item_new, "activate",
+ G_CALLBACK(moko_stylus_menu_activate_item),
+ item_new);
+ break;
+ } /* case */
+ } /* enumerate */
+
return ;
}
@@ -111,9 +123,21 @@
return GTK_IMAGE_MENU_ITEM(item);
}
-static void moko_stylus_menu_activate_item(GtkWidget* widget, const char* name)
+static void moko_stylus_menu_activate_item(GtkWidget* widget,
+ void *user_data)
{
- g_debug( "item activated: %s", name );
+ MokoDesktopItem *ditem = user_data;
+ g_debug( "item activated: %s", ditem->data );
+ switch (fork())
+ {
+ case 0:
+ mb_exec((char *)ditem->data);
+ fprintf(stderr, "exec failed, cleaning up child\n");
+ exit(1);
+ case -1:
+ fprintf(stderr, "can't fork\n");
+ break;
+ }
}
void
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
