Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
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. r3913 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
bindings bindings/python libmokoui ([EMAIL PROTECTED])
2. r3914 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3915 - in trunk/src/target/gsm: include/gsmd include/libgsmd
src/gsmd ([EMAIL PROTECTED])
4. r3916 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
5. r3917 - trunk/src/target/opkg ([EMAIL PROTECTED])
6. r3918 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2008-01-22 13:00:10 +0100 (Tue, 22 Jan 2008)
New Revision: 3913
Added:
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
Patch by: Frank Li <[EMAIL PROTECTED]>
* Makefile.am:
* bindings/python/Makefile.am:
* bindings/python/moko.override:
* bindings/python/mokomodule.c: (initmoko):
* configure.ac:
* libmokoui/Makefile.am:
* libmokoui/moko-finger-scroll.c:
(moko_finger_scroll_mode_get_type):
Add python bindings for MokoFingerScroll
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-01-22
09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-01-22
12:00:10 UTC (rev 3913)
@@ -1,10 +1,24 @@
-2008-01-04 Michael Lauer <[EMAIL PROTECTED]>
+2008-01-22 Chris Lord <[EMAIL PROTECTED]>
- * bindings/vala/libmokoui2.vapi
- * bindings/vala/libmokoui2.deps
- * bindings/vala/Makefile.am
- * configure.ac
- * Makefile.am
+ Patch by: Frank Li <[EMAIL PROTECTED]>
+
+ * Makefile.am:
+ * bindings/python/Makefile.am:
+ * bindings/python/moko.override:
+ * bindings/python/mokomodule.c: (initmoko):
+ * configure.ac:
+ * libmokoui/Makefile.am:
+ * libmokoui/moko-finger-scroll.c:
+ (moko_finger_scroll_mode_get_type):
+ Add python bindings for MokoFingerScroll
+
+2008-01-04 Michael Lauer <[EMAIL PROTECTED]>
+
+ * bindings/vala/libmokoui2.vapi:
+ * bindings/vala/libmokoui2.deps:
+ * bindings/vala/Makefile.am:
+ * configure.ac:
+ * Makefile.am:
Add Vala Bindings
2007-12-19 Chris Lord <[EMAIL PROTECTED]>
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am 2008-01-22
09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am 2008-01-22
12:00:10 UTC (rev 3913)
@@ -1,4 +1,4 @@
-SUBDIRS = libmokoui bindings/vala doc
+SUBDIRS = libmokoui bindings/vala doc $(PYTHON_BIND_DIR)
pcdata_DATA= libmokoui2.pc
pcdatadir= $(libdir)/pkgconfig
Added:
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
2008-01-22 12:00:10 UTC (rev 3913)
@@ -0,0 +1,29 @@
+
+PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0`
+PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION}
+
+CLEANFILES =
+ moko.defs \
+ moko.c
+
+moko.defs: ../../libmokoui/moko-finger-scroll.h
+ python /usr/share/pygtk/2.0/codegen/h2def.py
../../libmokoui/moko-finger-scroll.h > moko.defs
+
+moko.c: moko.defs moko.override
+ pygtk-codegen-2.0 --prefix moko \
+ --register $(PY_DEFS)/gdk-types.defs \
+ --register $(PY_DEFS)/gtk-types.defs \
+ --override moko.override \
+ moko.defs > $@
+
+pyexec_LTLIBRARIES =moko.la
+
+moko_la_SOURCES =moko.c mokomodule.c
+
+# set the include path found by configure
+INCLUDES= $(all_includes)
+
+AM_CPPFLAGS = $(PYTHON_INCLUDES) $(GTK_CFLAGS) $(PYGDK_CFLAGS)
$(PYGOB_CFLAGS) -I../../libmokoui/
+
+# the library search path.
+moko_la_LDFLAGS =-module -avoid-version $(all_libraries) $(GTK_LIBS)
$(PYGDK_LIBS) $(PYGOB_LIBS) ../../libmokoui/libmokoui2.la
Added:
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
2008-01-22 09:45:32 UTC (rev 3912)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
2008-01-22 12:00:10 UTC (rev 3913)
@@ -0,0 +1,14 @@
+%%
+headers
+#include "pygobject.h"
+#include "moko-finger-scroll.h"
+#include "moko-type.h"
+%%
+modulename moko
+%%
+import gtk.EventBox as PyGtkEventBox_Type
+import gtk.Widget as PyGtkWidget_Type
+%%
+ignore-glob
+ *_get_type
+%%
Added:
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
2008-01-22 09:45:32 UTC (rev 3912)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
2008-01-22 12:00:10 UTC (rev 3913)
@@ -0,0 +1,21 @@
+#include <pygobject.h>
+
+void moko_register_classes (PyObject *d);
+extern PyMethodDef moko_functions[];
+
+DL_EXPORT(void)
+initmoko(void)
+{
+ PyObject *m, *d;
+
+ init_pygobject ();
+
+ m = Py_InitModule ("moko", moko_functions);
+ d = PyModule_GetDict (m);
+
+ moko_register_classes (d);
+
+ if (PyErr_Occurred ()) {
+ Py_FatalError ("can't initialise module trayicon");
+ }
+}
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac
2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac
2008-01-22 12:00:10 UTC (rev 3913)
@@ -21,6 +21,24 @@
# base deps
PKG_CHECK_MODULES(DEPS, gtk+-2.0)
+AC_ARG_ENABLE(python,
+ [ --enable-python enable python binding [default=yes]],
+ enable_python=$enableval,
+ enable_python=yes)
+
+if test $enable_python != no ; then
+ AM_PATH_PYTHON(2.3.5)
+ PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.10.00)
+ AC_SUBST(PYGDK_CFLAGS)
+ AC_SUBST(PYGDK_LIBS)
+
+ PKG_CHECK_MODULES(PYGOB, pygobject-2.0 >= 2.11.0)
+ AC_SUBST(PYGOB_CFLAGS)
+ AC_SUBST(PYGOB_LIBS)
+ PYTHON_BIND_DIR=bindings/python
+ AC_SUBST(PYTHON_BIND_DIR)
+fi
+
if test x$MOKO_DEVEL = xon ; then
AC_MSG_NOTICE([removing -O2 from CFLAGS])
CFLAGS="-g -Wall"
@@ -33,6 +51,7 @@
GTK_DOC_CHECK([1.4])
+
# output stuff
AC_OUTPUT([
Makefile
@@ -42,6 +61,7 @@
doc/Makefile
doc/reference/Makefile
doc/reference/version.xml
+bindings/python/Makefile
])
echo "CFLAGS = $CFLAGS"
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am
2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am
2008-01-22 12:00:10 UTC (rev 3913)
@@ -2,13 +2,14 @@
moko-stock.h \
moko-finger-scroll.h \
moko-search-bar.h \
- moko-hint-entry.h
+ moko-hint-entry.h \
+ moko-type.h
source_c = \
moko-stock.c \
moko-finger-scroll.c \
moko-search-bar.c \
- moko-hint-entry.c
+ moko-hint-entry.c
DATADIR=$(datadir)
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2008-01-22 09:45:32 UTC (rev 3912)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2008-01-22 12:00:10 UTC (rev 3913)
@@ -973,3 +973,24 @@
gtk_container_add (GTK_CONTAINER (scroll), viewport);
}
+GType
+moko_finger_scroll_mode_get_type(void)
+{
+ static GType etype = 0;
+
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { MOKO_FINGER_SCROLL_MODE_PUSH,
+ "MOKO_FINGER_SCROLL_MODE_PUSH", "" },
+ { MOKO_FINGER_SCROLL_MODE_ACCEL,
+ "MOKO_FINGER_SCROLL_MODE_ACCEL", "" },
+ {0, NULL, NULL}
+ };
+
+ etype = g_flags_register_static (
+ g_intern_static_string ("MokoFingerScrollMode"),
+ values);
+ }
+
+ return etype;
+}
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-22 13:27:14 +0100 (Tue, 22 Jan 2008)
New Revision: 3914
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
Log:
2.6.24 did not match the vibrator LED device to the right driver
This fixes that and allows control of the vibrator by the following
path:
echo 127
>/sys/bus/platform/devices/neo1973-vibrator.0/leds/neo1973\:vibrator/brightness
Signed-off-by: warmcat <[EMAIL PROTECTED]>
gta02-core.patch
- arch/arm/mach-s3c2440/mach-gta02.c (gta01_led_dev): changed name from
gta01-led to neo1973-vibrator
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-22 12:00:10 UTC (rev 3913)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-core.patch
2008-01-22 12:27:14 UTC (rev 3914)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c
+Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/mach-gta02.c
++++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/mach-gta02.c
@@ -0,0 +1,821 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
@@ -501,7 +501,7 @@
+};
+
+static struct platform_device gta01_led_dev = {
-+ .name = "gta01-led",
++ .name = "neo1973-vibrator",
+ .num_resources = ARRAY_SIZE(gta01_led_resources),
+ .resource = gta01_led_resources,
+};
@@ -824,10 +824,10 @@
+ .init_machine = gta02_machine_init,
+ .timer = &s3c24xx_timer,
+MACHINE_END
-Index: linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/gta02.h
+Index: linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/asm-arm/arch-s3c2410/gta02.h
++++ linux-2.6.24-rc8/include/asm-arm/arch-s3c2410/gta02.h
@@ -0,0 +1,97 @@
+#ifndef _GTA02_H
+#define _GTA02_H
@@ -926,10 +926,10 @@
+#define GTA02v3_IRQ_nGSM_OC IRQ_EINT19 /* v3 + v4 only */
+
+#endif /* _GTA02_H */
-Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/Kconfig
+Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/mach-s3c2440/Kconfig
-+++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/Kconfig
+--- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Kconfig
@@ -74,5 +74,20 @@
help
Say Y here if you are using the FIC Neo1973 GSM Phone
@@ -951,19 +951,19 @@
+
endmenu
-Index: linux-2.6.24-rc7/arch/arm/mach-s3c2440/Makefile
+Index: linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/mach-s3c2440/Makefile
-+++ linux-2.6.24-rc7/arch/arm/mach-s3c2440/Makefile
+--- linux-2.6.24-rc8.orig/arch/arm/mach-s3c2440/Makefile
++++ linux-2.6.24-rc8/arch/arm/mach-s3c2440/Makefile
@@ -22,3 +22,4 @@
obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_HXD8) += mach-hxd8.o
+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-Index: linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+--- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
++++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -19,7 +19,9 @@
#include <linux/pcf50606.h>
@@ -1081,10 +1081,10 @@
/* 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);
-Index: linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+Index: linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ linux-2.6.24-rc7/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+--- linux-2.6.24-rc8.orig/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
++++ linux-2.6.24-rc8/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -19,8 +19,14 @@
#include <linux/errno.h>
@@ -1193,11 +1193,11 @@
return sysfs_create_group(&pdev->dev.kobj, >a01_gsm_attr_group);
}
-Index: linux-2.6.24-rc7/drivers/leds/leds-neo1973-vibrator.c
+Index: linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
===================================================================
---- linux-2.6.24-rc7.orig/drivers/leds/leds-neo1973-vibrator.c
-+++ linux-2.6.24-rc7/drivers/leds/leds-neo1973-vibrator.c
-@@ -107,7 +107,7 @@
+--- linux-2.6.24-rc8.orig/drivers/leds/leds-neo1973-vibrator.c
++++ linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
+@@ -113,7 +113,7 @@
struct resource *r;
int rc;
@@ -1206,10 +1206,10 @@
return -EIO;
r = platform_get_resource(pdev, 0, 0);
-Index: linux-2.6.24-rc7/sound/soc/s3c24xx/neo1973_wm8753.c
+Index: linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
===================================================================
---- linux-2.6.24-rc7.orig/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ linux-2.6.24-rc7/sound/soc/s3c24xx/neo1973_wm8753.c
+--- linux-2.6.24-rc8.orig/sound/soc/s3c24xx/neo1973_wm8753.c
++++ linux-2.6.24-rc8/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -672,6 +672,12 @@
{
int ret;
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-01-22 14:41:36 +0100 (Tue, 22 Jan 2008)
New Revision: 3915
Modified:
trunk/src/target/gsm/include/gsmd/gsmd.h
trunk/src/target/gsm/include/libgsmd/misc.h
trunk/src/target/gsm/src/gsmd/gsmd.c
trunk/src/target/gsm/src/gsmd/usock.c
Log:
gsmd: retrieve imsi value before sending at command (Sean Chiang)
Modified: trunk/src/target/gsm/include/gsmd/gsmd.h
===================================================================
--- trunk/src/target/gsm/include/gsmd/gsmd.h 2008-01-22 12:27:14 UTC (rev
3914)
+++ trunk/src/target/gsm/include/gsmd/gsmd.h 2008-01-22 13:41:36 UTC (rev
3915)
@@ -91,6 +91,7 @@
unsigned int mlbuf_len;
int mlunsolicited;
int alive_responded;
+ char imsi[16]; /* imsi mem space */
};
struct gsmd_user {
Modified: trunk/src/target/gsm/include/libgsmd/misc.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/misc.h 2008-01-22 12:27:14 UTC (rev
3914)
+++ trunk/src/target/gsm/include/libgsmd/misc.h 2008-01-22 13:41:36 UTC (rev
3915)
@@ -36,6 +36,7 @@
/* Operator Selection, Network Registration */
extern int lgsm_oper_get(struct lgsm_handle *lh);
+extern int lgsm_oper_n_get(struct lgsm_handle *lh);
extern int lgsm_opers_get(struct lgsm_handle *lh);
extern int lgsm_netreg_register(struct lgsm_handle *lh,
gsmd_oper_numeric oper);
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2008-01-22 12:27:14 UTC (rev
3914)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2008-01-22 13:41:36 UTC (rev
3915)
@@ -147,6 +147,16 @@
return 0;
}
+static int gsmd_get_imsi_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
+{
+ struct gsmd *g = ctx;
+
+ DEBUGP("imsi : %s\n", resp);
+ strcpy(g->imsi, resp);
+
+ return 0;
+}
+
int gsmd_simplecmd(struct gsmd *gsmd, char *cmdtxt)
{
struct gsmd_atcmd *cmd;
@@ -178,6 +188,9 @@
/* configure message format as PDU mode*/
/* FIXME: TEXT mode support!! */
rc |= gsmd_simplecmd(gsmd, "AT+CMGF=0");
+ /* reueset imsi */
+ atcmd_submit(gsmd, atcmd_fill("AT+CIMI", 7+1,
+ &gsmd_get_imsi_cb, gsmd, 0, NULL));
sms_cb_init(gsmd);
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2008-01-22 12:27:14 UTC (rev
3914)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2008-01-22 13:41:36 UTC (rev
3915)
@@ -638,7 +638,8 @@
gu->gsmd->dev_state.on = 0;
break;
case GSMD_PHONE_GET_IMSI:
- cmd = atcmd_fill("AT+CIMI", 7 + 1, &get_imsi_cb, gu, 0, NULL);
+ return gsmd_ucmd_submit(gu, GSMD_MSG_PHONE, GSMD_PHONE_GET_IMSI,
+ 0, strlen(gu->gsmd->imsi), gu->gsmd->imsi);
break;
default:
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-22 15:33:04 +0100 (Tue, 22 Jan 2008)
New Revision: 3916
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
* libmokoui/moko-finger-scroll.c: (parent_set_cb),
(moko_finger_scroll_add), (moko_finger_scroll_dispose),
(moko_finger_scroll_init), (moko_finger_scroll_mode_get_type):
Fix removal of widgets from a MokoFingerScroll causing crashes/weird
behaviour
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-01-22
13:41:36 UTC (rev 3915)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-01-22
14:33:04 UTC (rev 3916)
@@ -1,5 +1,13 @@
2008-01-22 Chris Lord <[EMAIL PROTECTED]>
+ * libmokoui/moko-finger-scroll.c: (parent_set_cb),
+ (moko_finger_scroll_add), (moko_finger_scroll_dispose),
+ (moko_finger_scroll_init), (moko_finger_scroll_mode_get_type):
+ Fix removal of widgets from a MokoFingerScroll causing crashes/weird
+ behaviour
+
+2008-01-22 Chris Lord <[EMAIL PROTECTED]>
+
Patch by: Frank Li <[EMAIL PROTECTED]>
* Makefile.am:
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2008-01-22 13:41:36 UTC (rev 3915)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2008-01-22 14:33:04 UTC (rev 3916)
@@ -632,14 +632,19 @@
}
static void
-moko_finger_scroll_remove_cb (GtkContainer *container,
- GtkWidget *child,
- MokoFingerScroll *scroll)
+parent_set_cb (GtkWidget *widget, GtkObject *parent, MokoFingerScroll *scroll)
{
- g_signal_handlers_disconnect_by_func (child,
- moko_finger_scroll_refresh, scroll);
- g_signal_handlers_disconnect_by_func (child,
- gtk_widget_queue_resize, scroll);
+ MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (scroll);
+
+ if (!parent) {
+ g_signal_handlers_disconnect_by_func (widget,
+ moko_finger_scroll_refresh, scroll);
+ g_signal_handlers_disconnect_by_func (widget,
+ gtk_widget_queue_resize, scroll);
+ g_signal_handlers_disconnect_by_func (widget,
+ parent_set_cb, scroll);
+ gtk_widget_set_scroll_adjustments (widget, NULL, NULL);
+ }
}
static void
@@ -649,10 +654,12 @@
MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (container);
gtk_container_add (GTK_CONTAINER (priv->align), child);
- g_signal_connect_swapped (G_OBJECT (child), "size-allocate",
+ g_signal_connect_swapped (child, "size-allocate",
G_CALLBACK (moko_finger_scroll_refresh), container);
- g_signal_connect_swapped (G_OBJECT (child), "size-request",
+ g_signal_connect_swapped (child, "size-request",
G_CALLBACK (gtk_widget_queue_resize), container);
+ g_signal_connect (child, "parent-set",
+ G_CALLBACK (parent_set_cb), container);
if (!gtk_widget_set_scroll_adjustments (
child, priv->hadjust, priv->vadjust))
@@ -725,9 +732,16 @@
static void
moko_finger_scroll_dispose (GObject * object)
{
- /*MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (object);*/
+ MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (object);
- while (g_source_remove_by_user_data (object));
+ if (priv->hadjust) {
+ g_object_unref (priv->hadjust);
+ priv->hadjust = NULL;
+ }
+ if (priv->vadjust) {
+ g_object_unref (priv->vadjust);
+ priv->vadjust = NULL;
+ }
if (G_OBJECT_CLASS (moko_finger_scroll_parent_class)->dispose)
G_OBJECT_CLASS (moko_finger_scroll_parent_class)->
@@ -897,8 +911,6 @@
G_CALLBACK (moko_finger_scroll_button_release_cb), NULL);
g_signal_connect (G_OBJECT (self), "motion-notify-event",
G_CALLBACK (moko_finger_scroll_motion_notify_cb), NULL);
- g_signal_connect (G_OBJECT (priv->align), "remove",
- G_CALLBACK (moko_finger_scroll_remove_cb), self);
g_signal_connect_swapped (G_OBJECT (priv->hadjust), "changed",
G_CALLBACK (moko_finger_scroll_refresh), self);
@@ -979,7 +991,7 @@
static GType etype = 0;
if (etype == 0) {
- static const GEnumValue values[] = {
+ static const GFlagsValue values[] = {
{ MOKO_FINGER_SCROLL_MODE_PUSH,
"MOKO_FINGER_SCROLL_MODE_PUSH", "" },
{ MOKO_FINGER_SCROLL_MODE_ACCEL,
@@ -988,8 +1000,8 @@
};
etype = g_flags_register_static (
- g_intern_static_string ("MokoFingerScrollMode"),
- values);
+ g_intern_static_string ("MokoFingerScrollMode"),
+ values);
}
return etype;
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-01-22 15:50:13 +0100 (Tue, 22 Jan 2008)
New Revision: 3917
Modified:
trunk/src/target/opkg/opkg_download.c
Log:
opkg: Fix #ifdef
Modified: trunk/src/target/opkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/opkg_download.c 2008-01-22 14:33:04 UTC (rev
3916)
+++ trunk/src/target/opkg/opkg_download.c 2008-01-22 14:50:13 UTC (rev
3917)
@@ -43,7 +43,7 @@
int i;
int p = d*100/t;
-#ifdef LIBOPKG
+#ifdef OPKG_LIB
if (opkg_cb_download_progress)
{
opkg_cb_download_progress (p);
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-22 16:07:45 +0100 (Tue, 22 Jan 2008)
New Revision: 3918
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
Log:
* src/sms.h:
* src/sms-contacts.c: (sms_contacts_page_new):
Store the MokoFingerScroll the treeview is placed in
* src/sms-notes.c: (forward_clicked_cb):
Show a contacts chooser for picking which contact to forward to
* src/sms-utils.c: (sms_contact_picker_dialog):
* src/sms-utils.h:
Add a utility function to pop up a dialog with the contacts chooser
from the contacts page
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-01-22 14:50:13 UTC (rev 3917)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-01-22 15:07:45 UTC (rev 3918)
@@ -1,3 +1,17 @@
+2008-01-22 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/sms.h:
+ * src/sms-contacts.c: (sms_contacts_page_new):
+ Store the MokoFingerScroll the treeview is placed in
+
+ * src/sms-notes.c: (forward_clicked_cb):
+ Show a contacts chooser for picking which contact to forward to
+
+ * src/sms-utils.c: (sms_contact_picker_dialog):
+ * src/sms-utils.h:
+ Add a utility function to pop up a dialog with the contacts chooser
+ from the contacts page
+
2008-01-17 Chris Lord <[EMAIL PROTECTED]>
* src/sms-main.c: (new_clicked_cb):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2008-01-22 14:50:13 UTC (rev 3917)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2008-01-22 15:07:45 UTC (rev 3918)
@@ -594,7 +594,7 @@
sms_contacts_page_new (SmsData *data)
{
EBookQuery *qrys[(E_CONTACT_LAST_PHONE_ID-E_CONTACT_FIRST_PHONE_ID)+1];
- GtkWidget *contacts_combo, *scroll, *vbox;
+ GtkWidget *contacts_combo, *vbox;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
EBookQuery *tel_query;
@@ -730,13 +730,16 @@
G_CALLBACK (jana_gtk_utils_treeview_resize), renderer);
/* Pack treeview into a finger-scroll */
- scroll = moko_finger_scroll_new ();
- gtk_container_add (GTK_CONTAINER (scroll), data->contacts_treeview);
+ data->contacts_scroll = moko_finger_scroll_new ();
+ gtk_container_add (GTK_CONTAINER (data->contacts_scroll),
+ data->contacts_treeview);
/* Pack widgets into vbox and return */
vbox = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), data->contacts_search, FALSE, TRUE,
0);
- gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), data->contacts_search,
+ FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), data->contacts_scroll,
+ TRUE, TRUE, 0);
gtk_widget_show_all (vbox);
/* Start book view */
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-01-22 14:50:13 UTC (rev 3917)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-01-22 15:07:45 UTC (rev 3918)
@@ -615,9 +615,9 @@
forward_clicked_cb (GtkToolButton *button, SmsData *data)
{
gchar *body;
- GtkTreeIter iter;
+ GtkTreeIter iter, citer;
GtkTreeModel *model;
- GtkTreeSelection *selection;
+ GtkTreeSelection *selection, *cselection;
/* Fill in compose box with message text and call new */
selection = gtk_tree_view_get_selection (
@@ -632,10 +632,18 @@
GTK_TEXT_VIEW (data->sms_textview)), body, -1);
g_free (body);
- /* TODO: Launch a contact-picker */
+ cselection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (data->contacts_treeview));
+ if (cselection)
+ gtk_tree_selection_get_selected (cselection, NULL, &citer);
- gtk_notebook_set_current_page (
- GTK_NOTEBOOK (data->notebook), SMS_PAGE_COMPOSE);
+ if (sms_contact_picker_dialog (
+ data, "Choose a contact to forward to:")) {
+ gtk_notebook_set_current_page (
+ GTK_NOTEBOOK (data->notebook), SMS_PAGE_COMPOSE);
+ } else {
+ gtk_tree_selection_select_iter (cselection, &citer);
+ }
}
static void
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
2008-01-22 14:50:13 UTC (rev 3917)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
2008-01-22 15:07:45 UTC (rev 3918)
@@ -21,6 +21,7 @@
#include "sms-utils.h"
#include <string.h>
#include <libmokoui2/moko-search-bar.h>
+#include <libmokoui2/moko-finger-scroll.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@@ -443,3 +444,46 @@
return FALSE;
}
+
+gboolean
+sms_contact_picker_dialog (SmsData *data, const gchar *message)
+{
+ GtkWidget *dialog, *scroll, *frame;
+ gint width, height;
+ gint result;
+
+ dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->window),
+ GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
+ message);
+ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (
+ GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_SPREAD);
+ gtk_window_get_size (GTK_WINDOW (data->window), &width, &height);
+ gtk_window_resize (GTK_WINDOW (dialog), width * 0.85, height * 0.85);
+
+ /* Remove the main contacts treeview from the contacts page and add it
+ * to this dialog... Bit hacky...
+ */
+ g_object_ref (data->contacts_treeview);
+ gtk_container_remove (GTK_CONTAINER (data->contacts_treeview->parent),
+ data->contacts_treeview);
+
+ frame = gtk_frame_new (NULL);
+ scroll = moko_finger_scroll_new ();
+ gtk_container_add (GTK_CONTAINER (scroll), data->contacts_treeview);
+ gtk_container_add (GTK_CONTAINER (frame), scroll);
+ gtk_widget_show_all (frame);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ frame, TRUE, TRUE, 0);
+ result = gtk_dialog_run (GTK_DIALOG (dialog));
+
+ gtk_container_remove (GTK_CONTAINER (data->contacts_treeview->parent),
+ data->contacts_treeview);
+ gtk_container_add (GTK_CONTAINER (data->contacts_scroll),
+ data->contacts_treeview);
+ g_object_unref (data->contacts_treeview);
+
+ gtk_widget_destroy (dialog);
+
+ return (result == GTK_RESPONSE_OK) ? TRUE : FALSE;
+}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
2008-01-22 14:50:13 UTC (rev 3917)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
2008-01-22 15:07:45 UTC (rev 3918)
@@ -31,5 +31,6 @@
gboolean sms_contacts_note_count_update (SmsData *data);
gboolean sms_delete_selected_contact_messages (SmsData *data);
gboolean sms_select_contact (SmsData *data, const gchar *uid);
+gboolean sms_contact_picker_dialog (SmsData *data, const gchar *message);
#endif /* SMS_UTILS_H */
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2008-01-22 14:50:13 UTC (rev 3917)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
2008-01-22 15:07:45 UTC (rev 3918)
@@ -69,6 +69,7 @@
GtkWidget *notes_treeview;
guint notes_scroll_idle;
+ GtkWidget *contacts_scroll;
GtkWidget *contacts_treeview;
GtkWidget *contacts_search;
GdkPixbuf *no_photo;
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
