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. r1467 - trunk/src/target/OM-2007/devel/qmake
([EMAIL PROTECTED])
2. r1468 - in trunk/src/target/OM-2007/panel-plugins: .
openmoko-panel-bt openmoko-panel-clock/data openmoko-panel-gps
openmoko-panel-gsm openmoko-panel-mainmenu
openmoko-panel-mainmenu/data openmoko-panel-usb
([EMAIL PROTECTED])
3. r1469 - trunk/oe/packages/ipkg/files ([EMAIL PROTECTED])
4. r1470 - trunk/src/target/OM-2007/openmoko-libs/libmokoui
([EMAIL PROTECTED])
5. r1471 -
trunk/src/target/OM-2007/applications/openmoko-keyboard
([EMAIL PROTECTED])
6. r1472 -
trunk/src/target/OM-2007/applications/openmoko-rssreader/src
([EMAIL PROTECTED])
7. r1473 - in developers/sean_chiang/gsm: include/gsmd
include/libgsmd src/gsmd src/libgsmd ([EMAIL PROTECTED])
8. r1474 -
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-03-22 01:22:08 +0100 (Thu, 22 Mar 2007)
New Revision: 1467
Modified:
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
Log:
qmake: no longer need libmb
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-03-22
00:18:57 UTC (rev 1466)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-03-22
00:22:08 UTC (rev 1467)
@@ -28,7 +28,7 @@
mokoui {
INCLUDEPATH += $(OPENMOKODIR)/openmoko-libs
- PKGCONFIG += gtk+-2.0 libmb
+ PKGCONFIG += gtk+-2.0
LIBS += -lmokoui -L$(OPENMOKODIR)/lib
}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-03-22 01:26:02 +0100 (Thu, 22 Mar 2007)
New Revision: 1468
Removed:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gprs/
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-phone/
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac
trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
Log:
openmoko panel-plugins: misc. cleanups
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
2007-03-22 00:22:08 UTC (rev 1467)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,4 +1,5 @@
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
SOURCES = src/openmoko-panel-bt.c
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
2007-03-22 00:22:08 UTC (rev 1467)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
2007-03-22 00:26:02 UTC (rev 1468)
@@ -5,15 +5,3 @@
#
resourcedir = $(pkgdatadir)
resource_DATA = clock-bg.png
-
-#
-# desktop integration: .desktop file
-#
-#desktopdir = $(datadir)/applications
-#dist_desktop_DATA = openmoko-panel-clock.desktop
-
-#
-# desktop integration: application icon
-#
-#appicondir = $(datadir)/icons
-#dist_appicon_DATA = clock-bg.png
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
2007-03-22 00:22:08 UTC (rev 1467)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,4 +1,5 @@
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
SOURCES = src/openmoko-panel-gps.c
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac
2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac
2007-03-22 00:26:02 UTC (rev 1468)
@@ -17,7 +17,7 @@
PKG_CHECK_MODULES(LIBGSMD, libgsmd,,
exit)
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS"
+LIBS="$LIBS $OPENMOKO_LIBS $LIBGSMD_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS"
# output stuff
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
2007-03-22 00:22:08 UTC (rev 1467)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,4 +1,5 @@
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
SOURCES = src/openmoko-panel-gsm.c
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
2007-03-22 00:22:08 UTC (rev 1467)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
2007-03-22 00:26:02 UTC (rev 1468)
@@ -5,14 +5,3 @@
#
resourcedir = $(pkgdatadir)
resource_DATA = btn_menu.png
-#
-# desktop integration: .desktop file
-#
-#desktopdir = $(datadir)/applications
-#dist_desktop_DATA = openmoko-panel-mainmenu.desktop
-
-#
-# desktop integration: application icon
-#
-#appicondir = $(datadir)/icons
-#dist_appicon_DATA =
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-03-22 00:22:08 UTC (rev 1467)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,5 +1,5 @@
+MOKOCONFIG = mokoui
MOKOTYPE = panel-plugin
-MOKOCONFIG = mokoui
SOURCES = \
src/openmoko-panel-mainmenu.c
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac
2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac
2007-03-22 00:26:02 UTC (rev 1468)
@@ -14,12 +14,9 @@
PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not
installed ***]))
-PKG_CHECK_MODULES(LIBGSMD, libgsmd,,
- exit)
+LIBS="$LIBS $OPENMOKO_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS"
-
# output stuff
AC_OUTPUT([
Makefile
Modified: trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2007-03-22
00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2007-03-22
00:26:02 UTC (rev 1468)
@@ -1,6 +1,9 @@
TEMPLATE = subdirs
SUBDIRS = \
openmoko-panel-battery \
+ openmoko-panel-bt \
openmoko-panel-clock \
+ openmoko-panel-gps \
+ openmoko-panel-gsm \
openmoko-panel-mainmenu
--- End Message ---
--- Begin Message ---
Author: ken_zhao
Date: 2007-03-22 01:34:05 +0100 (Thu, 22 Mar 2007)
New Revision: 1469
Modified:
trunk/oe/packages/ipkg/files/is-processing.patch
Log:
Fix "Size" field missing while installing local ipk file.
Modified: trunk/oe/packages/ipkg/files/is-processing.patch
===================================================================
--- trunk/oe/packages/ipkg/files/is-processing.patch 2007-03-22 00:26:02 UTC
(rev 1468)
+++ trunk/oe/packages/ipkg/files/is-processing.patch 2007-03-22 00:34:05 UTC
(rev 1469)
@@ -1,6 +1,6 @@
diff -Nur ipkg-0.99.163.orig/ipkg_install.c ipkg-0.99.163/ipkg_install.c
--- ipkg-0.99.163.orig/ipkg_install.c 2006-03-30 21:50:24.000000000 +0800
-+++ ipkg-0.99.163/ipkg_install.c 2007-03-15 08:01:20.887060992 +0800
++++ ipkg-0.99.163/ipkg_install.c 2007-03-15 08:01:20.000000000 +0800
@@ -211,6 +211,7 @@
anyone ever wants to make a nice libipkg. */
@@ -11,7 +11,7 @@
diff -Nur ipkg-0.99.163.orig/libbb/unzip.c ipkg-0.99.163/libbb/unzip.c
--- ipkg-0.99.163.orig/libbb/unzip.c 2006-02-06 16:13:02.000000000 +0800
-+++ ipkg-0.99.163/libbb/unzip.c 2007-03-15 08:03:45.513074496 +0800
++++ ipkg-0.99.163/libbb/unzip.c 2007-03-15 08:03:45.000000000 +0800
@@ -1028,13 +1028,15 @@
*/
extern void gz_close(int gunzip_pid)
@@ -37,7 +37,7 @@
}
diff -Nur ipkg-0.99.163.orig/pkg.c ipkg-0.99.163/pkg.c
--- ipkg-0.99.163.orig/pkg.c 2006-04-21 04:29:28.000000000 +0800
-+++ ipkg-0.99.163/pkg.c 2007-03-15 08:01:20.887060992 +0800
++++ ipkg-0.99.163/pkg.c 2007-03-20 15:11:32.845064480 +0800
@@ -33,6 +33,7 @@
#include "xsystem.h"
#include "ipkg_conf.h"
@@ -124,7 +124,32 @@
}
} else if (strcasecmp(field, "MD5sum") == 0) {
/* MD5sum */
-@@ -1016,6 +1049,12 @@
+@@ -871,6 +904,24 @@
+ }
+ temp[0]='\0';
+ snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n",
pkg->size);
++ } else {
++ if ( pkg->local_filename ) {
++ struct stat buf;
++ memset(&buf, 0, sizeof(struct stat));
++
++ if ( stat(pkg->local_filename, &buf) == 0 ) {
++
++ sprintf_alloc(&pkg->size, "%d", buf.st_size);
++ temp = (char *)realloc(temp, strlen(pkg->size)+8);
++ if ( temp == NULL ){
++ fprintf(stderr, "%s: out of memory\n",
__FUNCTION__);
++ return NULL;
++ }
++ temp[0]='\0';
++ snprintf(temp, (strlen(pkg->size)+8), "Size: %s\n",
pkg->size);
++ }
++ }
++
+ }
+ } else if (strcasecmp(field, "Source") == 0) {
+ /* Source */
+@@ -1016,6 +1067,12 @@
pkg_print_field(pkg, file, "Essential"); /* @@@@ should be removed in
future release. */
pkg_print_field(pkg, file, "Architecture");
pkg_print_field(pkg, file, "Conffiles");
@@ -139,7 +164,7 @@
}
diff -Nur ipkg-0.99.163.orig/pkg.h ipkg-0.99.163/pkg.h
--- ipkg-0.99.163.orig/pkg.h 2006-05-30 16:31:08.000000000 +0800
-+++ ipkg-0.99.163/pkg.h 2007-03-15 08:01:20.888060840 +0800
++++ ipkg-0.99.163/pkg.h 2007-03-15 08:01:20.000000000 +0800
@@ -176,6 +176,10 @@
int arch_priority;
/* Adding this flag, to "force" ipkg to choose a "provided_by_hand" package,
if there are multiple choice */
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-03-22 01:38:58 +0100 (Thu, 22 Mar 2007)
New Revision: 1470
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
Log:
openmoko-libs: yank libmb dependency
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
2007-03-22 00:34:05 UTC (rev 1469)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/libmokoui.pro
2007-03-22 00:38:58 UTC (rev 1470)
@@ -40,6 +40,6 @@
moko-tool-box.c \
moko-window.c
-PKGCONFIG += gtk+-2.0 libmb
+PKGCONFIG += gtk+-2.0
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-22 02:05:10 +0100 (Thu, 22 Mar 2007)
New Revision: 1471
Modified:
trunk/src/target/OM-2007/applications/openmoko-keyboard/Makefile.am
Log:
Change the matchbox to openmoko
Modified: trunk/src/target/OM-2007/applications/openmoko-keyboard/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-keyboard/Makefile.am
2007-03-22 00:38:58 UTC (rev 1470)
+++ trunk/src/target/OM-2007/applications/openmoko-keyboard/Makefile.am
2007-03-22 01:05:10 UTC (rev 1471)
@@ -4,13 +4,13 @@
SUBDIRS += examples
endif
-EXTRA_DIST = matchbox-keyboard.desktop matchbox-keyboard.png
+EXTRA_DIST = openmoko-keyboard.desktop openmoko-keyboard.png
desktopdir = $(datadir)/applications/inputmethods
-desktop_DATA = matchbox-keyboard.desktop
+desktop_DATA = openmoko-keyboard.desktop
pixmapsdir = $(datadir)/pixmaps/
-pixmaps_DATA = matchbox-keyboard.png
+pixmaps_DATA = openmoko-keyboard.png
snapshot:
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-03-22 02:05:35 +0100 (Thu, 22 Mar 2007)
New Revision: 1472
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
Log:
openmoko-rssreader: At least stop the TreeView columns from growing
Give 1/2 of the space to Subject and the other to the Date. Normally
one would give more space to the subject and less to the date but this
is not as easy.
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
2007-03-22 01:05:10 UTC (rev 1471)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/main.c
2007-03-22 01:05:35 UTC (rev 1472)
@@ -86,10 +86,14 @@
GtkTreeViewColumn *column;
ren = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
column = GTK_TREE_VIEW_COLUMN(gtk_tree_view_column_new_with_attributes(
_("Subject"), ren, "text", RSS_READER_COLUMN_SUBJECT, NULL));
+ gtk_tree_view_column_set_expand( column, TRUE );
+ gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
moko_tree_view_append_column( MOKO_TREE_VIEW(data->treeView), column );
ren = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
column = GTK_TREE_VIEW_COLUMN(gtk_tree_view_column_new_with_attributes(
_("Date"), ren, "text", RSS_READER_COLUMN_DATE, NULL));
+ gtk_tree_view_column_set_expand( column, TRUE );
+ gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
moko_tree_view_append_column( MOKO_TREE_VIEW(data->treeView), column );
/*
--- End Message ---
--- Begin Message ---
Author: sean_chiang
Date: 2007-03-22 02:13:32 +0100 (Thu, 22 Mar 2007)
New Revision: 1473
Modified:
developers/sean_chiang/gsm/include/gsmd/usock.h
developers/sean_chiang/gsm/include/libgsmd/sms.h
developers/sean_chiang/gsm/src/gsmd/gsmd.c
developers/sean_chiang/gsm/src/libgsmd/libgsmd_sms.c
Log:
Modified: developers/sean_chiang/gsm/include/gsmd/usock.h
===================================================================
--- developers/sean_chiang/gsm/include/gsmd/usock.h 2007-03-22 01:05:35 UTC
(rev 1472)
+++ developers/sean_chiang/gsm/include/gsmd/usock.h 2007-03-22 01:13:32 UTC
(rev 1473)
@@ -87,6 +87,61 @@
GSMD_SMS_FMT_TEXT = 1,
};
+/* Refer to GSM 03.40 subclause 9.2.3.1 */
+enum gsmd_sms_tp_mti {
+ GSMD_SMS_TP_MTI_DELIVER = 0,
+ GSMD_SMS_TP_MTI_DELIVER_REPORT = 0,
+ GSMD_SMS_TP_MTI_STATUS_REPORT = 2,
+ GSMD_SMS_TP_MTI_COMMAND = 2,
+ GSMD_SMS_TP_MTI_SUBMIT = 1,
+ GSMD_SMS_TP_MTI_SUBMIT_REPORT = 1,
+ GSMD_SMS_TP_MTI_RESERVED = 3,
+};
+
+/* Refer to GSM 03.40 subclause 9.2.3.2, */
+/* for SMS-DELIVER, SMS-STATUS-REPORT */
+enum gsmd_sms_tp_mms {
+ GSMD_SMS_TP_MMS_MORE = (0<<2),
+ GSMD_SMS_TP_MMS_NO_MORE = (1<<2),
+};
+
+/* Refer to GSM 03.40 subclause 9.2.3.3, */
+/* for SMS-SUBMIT */
+enum gsmd_sms_tp_vpf {
+ GSMD_SMS_TP_VPF_NOT_PRESENT = (0<<3),
+ GSMD_SMS_TP_VPF_RESERVED = (1<<3),
+ GSMD_SMS_TP_VPF_RELATIVE = (2<<3),
+ GSMD_SMS_TP_VPF_ABSOLUTE = (3<<3),
+};
+
+/* Refer to GSM 03.40 subclause 9.2.3.4, */
+/* for SMS-DELIVER */
+enum gsmd_sms_tp_sri {
+ GSMD_SMS_TP_SRI_NOT_RETURN = (0<<5),
+ GSMD_SMS_TP_SRI_STATUS_RETURN = (1<<5),
+};
+
+/* Refer to GSM 03.40 subclause 9.2.3.5, */
+/* for SMS-SUBMIT, SMS-COMMAND */
+enum gsmd_sms_tp_srr {
+ GSMD_SMS_TP_SRR_NOT_REQUEST = (0<<5),
+ GSMD_SMS_TP_SRR_STATUS_REQUEST = (1<<5),
+};
+
+/* Refer to GSM 03.40 subclause 9.2.3.17, */
+/* for SMS-SUBMIT, SMS-DELIVER */
+enum gsmd_sms_tp_rp {
+ GSMD_SMS_TP_RP_NOT_SET = (0<<7),
+ GSMD_SMS_TP_RP_SET = (1<<7),
+};
+
+/* Refer to GSM 03.40 subclause 9.2.3.23 */
+/* for SMS-SUBMIT, SMS-DELIVER */
+enum gsmd_sms_tp_udhi {
+ GSMD_SMS_TP_UDHI_NO_HEADER = (0<<6),
+ GSMD_SMS_TP_UDHI_WTIH_HEADER = (1<<6),
+};
+
/* SMS delflg from 3GPP TS 07.05, Clause 3.5.4 */
enum gsmd_msg_sms_delflg {
GSMD_SMS_DELFLG_INDEX = 0,
@@ -195,9 +250,25 @@
/* Refer to GSM 07.05 subclause 4.4 */
struct gsmd_sms_write {
u_int8_t stat;
- struct gsmd_sms sms;
+ struct gsmd_sms sms;
} __attribute__ ((packed));
+/* Refer to GSM 03.40 subclause 9.2.2.2 */
+struct gsmd_sms_submit {
+ u_int8_t length;
+ char data[GSMD_SMS_DATA_MAXLEN+1];
+} __attribute__ ((packed));
+
+/* Refer to GSM 03.40 subclause 9.2.2.1 */
+struct gsmd_sms_deliver {
+ u_int8_t length;
+ char origl_addr[12];
+ u_int8_t proto_ident;
+ u_int8_t coding_scheme;
+ char time_stamp[7];
+ char user_data[140];
+} __attribute__ ((packed));
+
/* Refer to GSM 07.07 subclause 8.12 */
struct gsmd_phonebook_readrg {
u_int8_t index1;
Modified: developers/sean_chiang/gsm/include/libgsmd/sms.h
===================================================================
--- developers/sean_chiang/gsm/include/libgsmd/sms.h 2007-03-22 01:05:35 UTC
(rev 1472)
+++ developers/sean_chiang/gsm/include/libgsmd/sms.h 2007-03-22 01:13:32 UTC
(rev 1473)
@@ -8,7 +8,6 @@
/* Data Coding Scheme, refer to GSM 03.38 Clause 4 */
#define B5_COMPRESSED (1<<5)
#define B4_CLASSMEANING (1<<4)
-
enum {
MESSAGE_CLASS_CLASS0 = 0x00,
MESSAGE_CLASS_CLASS1 = 0x01,
@@ -24,11 +23,10 @@
};
/* Coding of Alpha fields in the SIM for UCS2, refer to 3GPP TS 11.11 Annex B
*/
-#if 0
-enum {
+//enum {
+
+//};
-};
-#endif
/* SMS delflg from 3GPP TS 07.05, Clause 3.5.4 */
enum lgsm_msg_sms_delflg {
@@ -93,5 +91,23 @@
/* Packing of 7-bit characters, refer to GSM 03.38 subclause 6.1.2.1.1 */
extern int unpacking_7bit_character(char *src, char *dest);
+/* Refer to 3GPP TS 11.11 Annex B */
+extern int packing_UCS2_80(char *src, char *dest);
+
+/* Refer to 3GPP TS 11.11 Annex B */
+extern int unpacking_UCS2_80(char *src, char *dest);
+
+/* Refer to 3GPP TS 11.11 Annex B */
+extern int packing_UCS2_81(char *src, char *dest);
+
+/* Refer to 3GPP TS 11.11 Annex B */
+extern int unpacking_UCS2_81(char *src, char *dest);
+
+/* Refer to 3GPP TS 11.11 Annex B */
+extern int packing_UCS2_82(char *src, char *dest);
+
+/* Refer to 3GPP TS 11.11 Annex B */
+extern int unpacking_UCS2_82(char *src, char *dest);
+
#endif
Modified: developers/sean_chiang/gsm/src/gsmd/gsmd.c
===================================================================
--- developers/sean_chiang/gsm/src/gsmd/gsmd.c 2007-03-22 01:05:35 UTC (rev
1472)
+++ developers/sean_chiang/gsm/src/gsmd/gsmd.c 2007-03-22 01:13:32 UTC (rev
1473)
@@ -81,6 +81,10 @@
/* configure message format as PDU mode*/
/* FIXME: TEXT mode support!! */
rc |= gsmd_simplecmd(gsmd, "AT+CMGF=0");
+#if 0
+ /* Select TE character set */
+ rc |= gsmd_simplecmd(gsmd, "AT+CSCS=\"UCS2\"");
+#endif
if (gsmd->vendorpl && gsmd->vendorpl->initsettings)
return gsmd->vendorpl->initsettings(gsmd);
Modified: developers/sean_chiang/gsm/src/libgsmd/libgsmd_sms.c
===================================================================
--- developers/sean_chiang/gsm/src/libgsmd/libgsmd_sms.c 2007-03-22
01:05:35 UTC (rev 1472)
+++ developers/sean_chiang/gsm/src/libgsmd/libgsmd_sms.c 2007-03-22
01:13:32 UTC (rev 1473)
@@ -192,3 +192,39 @@
return 0;
}
+
+/* Refer to 3GPP TS 11.11 Annex B */
+int packing_UCS2_80(char *src, char *dest)
+{
+ return 0;
+}
+
+/* Refer to 3GPP TS 11.11 Annex B */
+int unpacking_UCS2_80(char *src, char *dest)
+{
+ return 0;
+}
+
+/* Refer to 3GPP TS 11.11 Annex B */
+int packing_UCS2_81(char *src, char *dest)
+{
+ return 0;
+}
+
+/* Refer to 3GPP TS 11.11 Annex B */
+int unpacking_UCS2_81(char *src, char *dest)
+{
+ return 0;
+}
+
+/* Refer to 3GPP TS 11.11 Annex B */
+int packing_UCS2_82(char *src, char *dest)
+{
+ return 0;
+}
+
+/* Refer to 3GPP TS 11.11 Annex B */
+int unpacking_UCS2_82(char *src, char *dest)
+{
+ return 0;
+}
\ No newline at end of file
--- End Message ---
--- Begin Message ---
Author: zhiyong_sun
Date: 2007-03-22 06:32:52 +0100 (Thu, 22 Mar 2007)
New Revision: 1474
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
Log:
fix warnings
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
2007-03-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
2007-03-22 05:32:52 UTC (rev 1474)
@@ -52,14 +52,13 @@
g_debug ("Call moko finger menu hide");
moko_dbus_send_message ("");
}
-
}
void
moko_wheel_left_up_press_cb (GtkWidget *self, MokoFingerMenu *fm)
{
//moko_icon_view_move_cursor_line_up (mma->fm->mm->icon_view);
- moko_finger_menu_move_cursor_up(fm);
+ moko_finger_menu_move_cursor_up(fm);
}
void
@@ -83,9 +82,7 @@
if (selected_item->type == ITEM_TYPE_FOLDER)
{
- // moko_finger_menu_set_current_item(mma->fm, selected_item);
- moko_finger_menu_update_content (fm, selected_item);
- // moko_main_menu_update_content (mma->mm, selected_item);
+ moko_finger_menu_update_content (fm, selected_item);
}
else if (selected_item->type == ITEM_TYPE_DOTDESKTOP_ITEM
||selected_item->type == ITEM_TYPE_APP)
{
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c
2007-03-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/fingermenu.c
2007-03-22 05:32:52 UTC (rev 1474)
@@ -67,12 +67,12 @@
self->window = MOKO_FINGER_WINDOW(moko_finger_window_new());
gtk_widget_show (GTK_WIDGET (self->window));
- self->wheel = moko_finger_window_get_wheel (self->window);
+ self->wheel = MOKO_FINGER_WHEEL(moko_finger_window_get_wheel (self->window));
- self->toolbox = moko_finger_window_get_toolbox (self->window);
+ self->toolbox = MOKO_FINGER_TOOL_BOX(moko_finger_window_get_toolbox
(self->window));
self->history = moko_app_history_init (self->toolbox);
self->mm = MAINMENU (moko_main_menu_new());
- gtk_widget_show (self->mm);
+ gtk_widget_show (GTK_WIDGET(self->mm));
g_signal_connect (self->wheel, "press_bottom", G_CALLBACK (
moko_wheel_bottom_press_cb), self);
g_signal_connect (self->wheel, "press_left_up", G_CALLBACK (
moko_wheel_left_up_press_cb), self);
@@ -96,7 +96,7 @@
return;
gtk_widget_show_all (GTK_WIDGET(self->window));
- gtk_widget_show_all (self->mm);
+ gtk_widget_show_all (GTK_WIDGET(self->mm));
//gtk_widget_show (GTK_WIDGET(self->window));
gtk_widget_show (GTK_WIDGET(self->toolbox));
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
2007-03-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
2007-03-22 05:32:52 UTC (rev 1474)
@@ -32,7 +32,7 @@
static void moko_main_menu_init(MokoMainMenu *mm);
-static guint menu_signals[LAST_SIGNAL] = { 0 };
+//static guint menu_signals[LAST_SIGNAL] = { 0 };
/**
[EMAIL PROTECTED] retrun MokoMainMenu type.
@@ -51,7 +51,7 @@
sizeof (MokoMainMenuClass),
NULL, /* base_init */
NULL, /* base_finalize */
- NULL, /* class_init *///(GClassInitFunc) moko_main_menu_class_init,
+ (GClassInitFunc) moko_main_menu_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MokoMainMenu),
@@ -85,38 +85,29 @@
moko_main_menu_init(MokoMainMenu *mm)
{
PangoFontDescription* PangoFont = pango_font_description_new(); //get
system default PangoFontDesc
- GtkEventBox *eventbox;
+ GtkWidget *eventbox;
mm->top_item = NULL;
mm->current = NULL;
/*center label of MokoMainMenu head*/
- mm->section_name = gtk_label_new ("Main Menu");
+ mm->section_name = gtk_label_new ("Main Menu");
gtk_widget_show (mm->section_name);
- gtk_widget_set_name (GTK_WIDGET (mm->section_name), "Section Name");
- gtk_label_set_single_line_mode (mm->section_name, TRUE);
+ gtk_widget_set_name (mm->section_name, "Section Name");
+ gtk_label_set_single_line_mode (GTK_LABEL(mm->section_name), TRUE);
gtk_misc_set_alignment (GTK_MISC (mm->section_name), SECTION_ALG_X,
SECTION_ALG_Y);
gtk_misc_set_padding (GTK_MISC (mm->section_name), SECTION_X_PADDING,
SECTION_Y_PADDING);
- gtk_label_set_ellipsize (mm->section_name, PANGO_ELLIPSIZE_END);
- /* if (PangoFont) {
- pango_font_description_set_size (PangoFont, FONT_SIZE_SECTION);
- gtk_widget_modify_font (GTK_WIDGET (mm->section_name), PangoFont);
- }
- else {
- g_debug("FAILED to load FONT ");
- }
-*/
+ gtk_label_set_ellipsize (GTK_LABEL(mm->section_name), PANGO_ELLIPSIZE_END);
-
/*right side label of MokoMainMenu head*/
mm->item_total = gtk_label_new ("");
//gtk_widget_show (mm->item_total);
- gtk_label_set_justify (mm->item_total, GTK_JUSTIFY_RIGHT);
- gtk_label_set_width_chars (mm->item_total, ITME_TOTAL_WIDTH);
+ gtk_label_set_justify (GTK_LABEL(mm->item_total), GTK_JUSTIFY_RIGHT);
+ gtk_label_set_width_chars (GTK_LABEL(mm->item_total), ITME_TOTAL_WIDTH);
gtk_misc_set_alignment (GTK_MISC (mm->item_total), ITEM_TOTAL_ALG_X,
ITEM_TOTAL_ALG_Y);
if (PangoFont) {
pango_font_description_set_size (PangoFont, FONT_SIZE_ITEM);
- gtk_widget_modify_font (GTK_WIDGET (mm->item_total), PangoFont);
+ gtk_widget_modify_font (mm->item_total, PangoFont);
}
else {
g_debug("FAILED to load FONT ");
@@ -124,12 +115,12 @@
//Only used to change background
eventbox = gtk_event_box_new ();
- gtk_event_box_set_visible_window (eventbox, TRUE);
+ gtk_event_box_set_visible_window (GTK_EVENT_BOX(eventbox), TRUE);
gtk_widget_show (eventbox);
gtk_widget_set_name (eventbox, "gtkeventbox-black");
/*MokoIconView object initialize*/
- mm->icon_view = moko_icon_view_new();
+ mm->icon_view = MOKO_ICON_VIEW(moko_icon_view_new());
moko_icon_view_set_item_width(mm->icon_view, ITEM_WIDTH);
moko_icon_view_set_columns (mm->icon_view, COLUMN_NUM);
moko_icon_view_set_margin (mm->icon_view, ITEM_MARGIN);
@@ -140,7 +131,7 @@
moko_icon_view_set_text_bg (mm->icon_view,
PKGDATADIR"/main_menu_sel_text.png");
moko_icon_view_set_decorated (mm->icon_view, TRUE);
moko_icon_view_set_max_text_length(mm->icon_view, 20);
- gtk_widget_show (mm->icon_view);
+ gtk_widget_show (GTK_WIDGET(mm->icon_view));
mm->list_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING,
G_TYPE_POINTER);
moko_icon_view_set_pixbuf_column (mm->icon_view, PIXBUF_COLUMN);
@@ -151,16 +142,16 @@
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mm->scrolled),
GTK_POLICY_NEVER, GTK_POLICY_NEVER);
gtk_widget_show (mm->scrolled);
- gtk_container_add (GTK_CONTAINER (mm->scrolled), mm->icon_view);
+ gtk_container_add (GTK_CONTAINER (mm->scrolled),
GTK_WIDGET(mm->icon_view));
mm->hbox = gtk_hbox_new (FALSE, FALSE);
gtk_widget_show (mm->hbox);
- gtk_box_pack_start (mm, eventbox, FALSE, FALSE, 0);
- gtk_container_add (eventbox, mm->hbox);
- gtk_box_pack_start (mm->hbox, mm->section_name, TRUE, TRUE, 0);
- gtk_box_pack_end (mm->hbox, mm->item_total, FALSE, FALSE, 0);
- gtk_box_pack_end (mm, mm->scrolled, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(mm), eventbox, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER(eventbox), mm->hbox);
+ gtk_box_pack_start (GTK_BOX(mm->hbox), mm->section_name, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX(mm->hbox), mm->item_total, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX(mm), GTK_WIDGET(mm->scrolled), TRUE, TRUE, 0);
if (PangoFont)
@@ -256,7 +247,7 @@
//g_debug("mokodesktop: item [%d][%s][%s]\n", item->type, item->name,
item->icon_name);
if (!mm)
- return;
+ return FALSE;
mm->current = item;
item_new = item->item_child;
@@ -265,11 +256,11 @@
if (item->type == ITEM_TYPE_ROOT)
{
- moko_set_label_content (mm->section_name, "Main Menu");
+ moko_set_label_content (GTK_LABEL(mm->section_name), "Main Menu");
}
else if (item->type == ITEM_TYPE_FOLDER)
{
- moko_set_label_content (mm->section_name, item->name);
+ moko_set_label_content (GTK_LABEL(mm->section_name), item->name);
}
else
return FALSE; // neither ROOT nor FOLDER
@@ -277,6 +268,8 @@
if (mm->list_store)
gtk_list_store_clear (mm->list_store);
+ moko_icon_view_refresh (mm->icon_view);
+
mokodesktop_items_enumerate_siblings(item->item_child, item_new)
{
count +=1;
@@ -288,20 +281,20 @@
else
{
char path[512];
- snprintf (path, 512, "%s/%s", PIXMAP_PATH, item_new->icon_name);
+ snprintf (path, 512, "%s/%s", PIXMAP_PATH,
item_new->icon_name);//FIXME: "PIXMAP_PATH" this path will not find out all
icons.
if (access (path, 0) == 0)
moko_fill_model(mm->list_store, path, item_new->name,
item_new);
else
{
- snprintf (path, 512, "%s/%s", PKGDATADIR,
"default-app-icon.xpm");
+ snprintf (path, 512, "%s/%s", PKGDATADIR,
"default-app-icon.xpm");
moko_fill_model(mm->list_store, path, item_new->name, item_new);
}
}
}
snprintf (total_item, 6, "00/%.2d", count);
- moko_set_label_content(mm->item_total, total_item);
+ moko_set_label_content(GTK_LABEL(mm->item_total), total_item);
return TRUE;
}
@@ -326,7 +319,7 @@
return;
snprintf (item_total, 6, "%.2d/%.2d", cursor, total);
- moko_set_label_content (mm->item_total, item_total);
+ moko_set_label_content (GTK_LABEL(mm->item_total), item_total);
}
/**
@@ -340,5 +333,5 @@
void
moko_main_menu_set_section_name_label (MokoMainMenu *mm, const char *str)
{
- moko_set_label_content (mm->section_name, str);
+ moko_set_label_content (GTK_LABEL(mm->section_name), str);
}
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
2007-03-22 01:13:32 UTC (rev 1473)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
2007-03-22 05:32:52 UTC (rev 1474)
@@ -81,9 +81,9 @@
MokoIconView *icon_view;
GtkListStore *list_store;
GtkWidget *scrolled;
- GtkHBox *hbox;
- GtkLabel *section_name;
- GtkLabel *item_total;
+ GtkWidget *hbox;
+ GtkWidget *section_name;
+ GtkWidget *item_total;
};
struct _MokoMainMenuClass {
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
