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. r1292 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
2. r1293 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
3. r1294 - developers/werner ([EMAIL PROTECTED])
4. r1295 - in trunk/oe/packages/upstart: . files
([EMAIL PROTECTED])
5. r1296 -
trunk/src/target/OM-2007/applications/openmoko-messages/src
([EMAIL PROTECTED])
6. r1297 -
trunk/src/target/OM-2007/applications/openmoko-keyboard/src
([EMAIL PROTECTED])
7. r1298 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-03-09 01:11:33 +0100 (Fri, 09 Mar 2007)
New Revision: 1292
Modified:
trunk/src/target/u-boot/patches/mmc-fixes.patch
Log:
cpu/arm920t/s3c24x0/mmc.c (mmc_init): added SD CID extraction besides MMC CID
version
Modified: trunk/src/target/u-boot/patches/mmc-fixes.patch
===================================================================
--- trunk/src/target/u-boot/patches/mmc-fixes.patch 2007-03-09 00:07:50 UTC
(rev 1291)
+++ trunk/src/target/u-boot/patches/mmc-fixes.patch 2007-03-09 00:11:33 UTC
(rev 1292)
@@ -40,14 +40,135 @@
static u_int32_t mmc_size(const struct mmc_csd *csd)
{
-@@ -361,7 +361,6 @@ int mmc_init(int verbose)
+@@ -331,6 +331,56 @@ static u_int32_t mmc_size(const struct m
+ return blocknr * block_len;
+ }
++struct sd_cid {
++ char pnm_0; /* product name */
++ char oid_1; /* OEM/application ID */
++ char oid_0;
++ uint8_t mid; /* manufacturer ID */
++ char pnm_4;
++ char pnm_3;
++ char pnm_2;
++ char pnm_1;
++ uint8_t psn_2; /* product serial number */
++ uint8_t psn_1;
++ uint8_t psn_0; /* MSB */
++ uint8_t prv; /* product revision */
++ uint8_t crc; /* CRC7 checksum, b0 is unused and set to 1 */
++ uint8_t mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */
++ uint8_t mdt_0; /* MSB */
++ uint8_t psn_3; /* LSB */
++};
++
++static void print_mmc_cid(mmc_cid_t *cid)
++{
++ printf("MMC found. Card desciption is:\n");
++ printf("Manufacturer ID = %02x%02x%02x\n",
++ cid->id[0], cid->id[1], cid->id[2]);
++ printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev);
++ cid->hwrev = cid->fwrev = 0; /* null terminate string */
++ printf("Product Name = %s\n",cid->name);
++ printf("Serial Number = %02x%02x%02x\n",
++ cid->sn[0], cid->sn[1], cid->sn[2]);
++ printf("Month = %d\n",cid->month);
++ printf("Year = %d\n",1997 + cid->year);
++}
++
++static void print_sd_cid(const struct sd_cid *cid)
++{
++ printf("Manufacturer: 0x%02x, OEM \"%c%c\"\n",
++ cid->mid, cid->oid_0, cid->oid_1);
++ printf("Product name: \"%c%c%c%c%c\", revision %d.%d\n",
++ cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3, cid->pnm_4,
++ cid->prv >> 4, cid->prv & 15);
++ printf("Serial number: %u\n",
++ cid->psn_0 << 24 | cid->psn_1 << 16 | cid->psn_2 << 8 |
++ cid->psn_3);
++ printf("Manufacturing date: %d/%d\n",
++ cid->mdt_1 & 15,
++ 2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4));
++ printf("CRC: 0x%02x, b0 = %d\n",
++ cid->crc >> 1, cid->crc & 1);
++}
++
+ int mmc_init(int verbose)
+ {
+ int retries, rc = -ENODEV;
+@@ -361,7 +411,6 @@ int mmc_init(int verbose)
+
printf("trying to detect SD Card...\n");
while (retries--) {
- int i;
udelay(100000);
resp = mmc_cmd(55, 0x00000000, CMD_F_RESP);
resp = mmc_cmd(41, 0x00300000, CMD_F_RESP);
+@@ -386,20 +435,38 @@ int mmc_init(int verbose)
+ /* try to get card id */
+ resp = mmc_cmd(MMC_CMD_ALL_SEND_CID, 0, CMD_F_RESP|CMD_F_RESP_LONG);
+ if (resp) {
+- /* TODO configure mmc driver depending on card attributes */
+- mmc_cid_t *cid = (mmc_cid_t *)resp;
+- if (verbose) {
+- printf("MMC found. Card desciption is:\n");
+- printf("Manufacturer ID = %02x%02x%02x\n",
+- cid->id[0], cid->id[1],
cid->id[2]);
+- printf("HW/FW Revision = %x %x\n",cid->hwrev,
cid->fwrev);
+- cid->hwrev = cid->fwrev = 0; /* null terminate
string */
+- printf("Product Name = %s\n",cid->name);
+- printf("Serial Number = %02x%02x%02x\n",
+- cid->sn[0], cid->sn[1],
cid->sn[2]);
+- printf("Month = %d\n",cid->month);
+- printf("Year = %d\n",1997 + cid->year);
++ if (!is_sd) {
++ /* TODO configure mmc driver depending on card
++ attributes */
++ mmc_cid_t *cid = (mmc_cid_t *)resp;
++
++ if (verbose)
++ print_mmc_cid(cid);
++ sprintf(mmc_dev.vendor,
++ "Man %02x%02x%02x Snr %02x%02x%02x",
++ cid->id[0], cid->id[1], cid->id[2],
++ cid->sn[0], cid->sn[1], cid->sn[2]);
++ sprintf(mmc_dev.product,"%s",cid->name);
++ sprintf(mmc_dev.revision,"%x %x",
++ cid->hwrev, cid->fwrev);
++ }
++ else {
++ struct sd_cid *cid = (struct sd_cid *) resp;
++
++ if (verbose)
++ print_sd_cid(cid);
++ sprintf((char *) mmc_dev.vendor,
++ "Man %02 OEM %c%c \"%c%c%c%c%c\"",
++ cid->mid, cid->oid_0, cid->oid_1,
++ cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3,
++ cid->pnm_4);
++ sprintf((char *) mmc_dev.product, "%d",
++ cid->psn_0 << 24 | cid->psn_1 << 16 |
++ cid->psn_2 << 8 | cid->psn_3);
++ sprintf((char *) mmc_dev.revision, "%d.%d",
++ cid->prv >> 4, cid->prv & 15);
+ }
++
+ /* fill in device description */
+ mmc_dev.if_type = IF_TYPE_MMC;
+ mmc_dev.part_type = PART_TYPE_DOS;
+@@ -409,11 +476,6 @@ int mmc_init(int verbose)
+ /* FIXME fill in the correct size (is set to 32MByte) */
+ mmc_dev.blksz = 512;
+ mmc_dev.lba = 0x10000;
+- sprintf(mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x",
+- cid->id[0], cid->id[1], cid->id[2],
+- cid->sn[0], cid->sn[1], cid->sn[2]);
+- sprintf(mmc_dev.product,"%s",cid->name);
+- sprintf(mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev);
+ mmc_dev.removable = 0;
+ mmc_dev.block_read = mmc_bread;
+
Index: u-boot/include/asm-arm/arch-s3c24x0/regs-sdi.h
===================================================================
--- u-boot.orig/include/asm-arm/arch-s3c24x0/regs-sdi.h
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-09 01:13:48 +0100 (Fri, 09 Mar 2007)
New Revision: 1293
Modified:
trunk/src/target/u-boot/patches/mmc-fixes.patch
Log:
cpu/arm920t/s3c24x0/mmc.c (mmc_bread): don't need to cast "dst" anymore when
passing to mmc_read (was missing in earlier commit)
cpu/arm920t/s3c24x0/mmc.c (mmc_init): added casts to suppress warnings when
using an "unsigned char *" buffer in sprintf
Modified: trunk/src/target/u-boot/patches/mmc-fixes.patch
===================================================================
--- trunk/src/target/u-boot/patches/mmc-fixes.patch 2007-03-09 00:11:33 UTC
(rev 1292)
+++ trunk/src/target/u-boot/patches/mmc-fixes.patch 2007-03-09 00:13:48 UTC
(rev 1293)
@@ -20,7 +20,7 @@
dcon |= S3C2410_SDIDCON_BLOCKMODE;
dcon |= S3C2410_SDIDCON_RXAFTERCMD|S3C2410_SDIDCON_XFER_RXSTART;
if (wide)
-@@ -309,7 +307,7 @@ int mmc_write(uchar *src, ulong dst, int
+@@ -309,16 +307,18 @@ int mmc_write(uchar *src, ulong dst, int
return 0;
}
@@ -29,7 +29,9 @@
{
int mmc_block_size = MMC_BLOCK_SIZE;
ulong src = blknr * mmc_block_size + CFG_MMC_BASE;
-@@ -318,7 +316,9 @@ ulong mmc_bread(int dev_num, ulong blknr
+
+- mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size);
++ mmc_read(src, dst, blkcnt*mmc_block_size);
return blkcnt;
}
@@ -129,12 +131,12 @@
+
+ if (verbose)
+ print_mmc_cid(cid);
-+ sprintf(mmc_dev.vendor,
++ sprintf((char *) mmc_dev.vendor,
+ "Man %02x%02x%02x Snr %02x%02x%02x",
+ cid->id[0], cid->id[1], cid->id[2],
+ cid->sn[0], cid->sn[1], cid->sn[2]);
-+ sprintf(mmc_dev.product,"%s",cid->name);
-+ sprintf(mmc_dev.revision,"%x %x",
++ sprintf((char *) mmc_dev.product,"%s",cid->name);
++ sprintf((char *) mmc_dev.revision,"%x %x",
+ cid->hwrev, cid->fwrev);
+ }
+ else {
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-09 01:32:24 +0100 (Fri, 09 Mar 2007)
New Revision: 1294
Modified:
developers/werner/TODO
Log:
Cleanup and update. Removed "items done" list, since it just gets confusing.
It's in SVN anyway :-)
Modified: developers/werner/TODO
===================================================================
--- developers/werner/TODO 2007-03-09 00:13:48 UTC (rev 1293)
+++ developers/werner/TODO 2007-03-09 00:32:24 UTC (rev 1294)
@@ -1,44 +1,34 @@
IRC/neo-devel:
- kick off bad block migration with all other phase -1 developers
- [ done so far: mickey, thos, xora ]
+ [ done so far: mickey, thos, xora ] (obsolete ? just devirginate.)
planning/design:
-- phase 0 default environment draft (neo-devel)
-- virgin system auto-install environment
+- phase 0 default environment draft (neo-devel) (obsolete ?)
Mickey:
-- ask for quick walk-through review
+- ask for quick walk-through review (obsolete ?)
coreteam:
- send customs war story
bugzilla:
P0
- - #79: suspend/resume to RAM support
- - #178: u-boot 'factory reset' option
P1
- #164: improve non-SanDisk microSD support in u-boot
- - #179: Implement u-boot power-off timer
- ??
- - #202: Start using NAND hardware ECC support
other:
-- test V-360 headset
- set up automated build tests on buildhost-old
- check: does default build yield old or new sjf ? if new, update
Building_OpenMoko_from_scratch#Flash_boot_loader_into_NAND
- once SVN opens, check that build passes without prompting for certificates or
authentication. then update Building_OpenMoko_from_scratch#OpenEmbedded_build
-- local: make fs ("lab") boot into Gentoo directly
u-boot:
-- set up openocd and familiarize with it (-> update wiki)
- bbt migration & walk-through: future updates
- update for debug v2
- switch from wiggler to openocd
- all boards will be v3 or later, so mention battery in
Building_OpenMoko_from_scratch#Start_the_Neo_and_enter_the_boot_prompt
-- u-boot: fix weird "product name" after "mmc[init]"
- write "intelligent" serial/USB console tool
- u-boot: make fatload behave like ext2load (hex output, ${filesize})
- idea: connect charger when off -> show battery gauge
@@ -46,76 +36,46 @@
https://wiki.internal.openmoko.org/wiki/Bluetooth_MAC_Assignments
- u-boot NAND update also removes environment offset. Documented it. Fix it,
too ?
+ - also in DFU, it seems (fixed there !)
- check that we don't have hidden power-on sequences (e.g., USB disconnect)
- write requests for power measurements (TBD)
- think about u-boot progress bar (e.g., time-driven)
-- review schematics before the end of Chinese new year holidays
- verify/update
https://wiki.openmoko.org/wiki/NAND_bad_blocks#JTAG_.2F_OpenOCD_.2F_u-boot_RAM_based
https://wiki.openmoko.org/wiki/Bootloader#Using_JTAG_to_boot_from_RAM
- find out why Harald's debug v2 is 6 times (!) faster than my JTAGkey
+- http://downloads.openmoko.org/snapshots/ (pester)
+- screenshots
+- compile BB wishlist (bb forget, ...)
---- Feb 13 --------------------------------------------------------------------
+Infrastructure:
+- get debug v2 to work
+- local: make fs ("lab") boot into Gentoo directly
- - (#164) survey cards, then update Wiki
-- check (non-)use of BB_COLLECTIONS (do I have to care ?) [mickey says it's ok]
-- check walk-through exceptions [mickey says keep them]
-- put shipping instructions on Wiki
-- complete bad block migration (mickey)
+review:
+http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=231
+http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=237
---- Feb 14 --------------------------------------------------------------------
+- reopen #179 for console without menu
+- we need to check for an invalid block marker in the first _and_
+ +second page of each block
+ <LaF0rge> i think we only check in the first page
+- <LaF0rge> btw: some mid-term optimization: don't read the splash screen
untile
+ +we've leaft board_late_init (or reached the end of it)
+ > right now, gcc doesn't know in bar.c what happens to var_set_by_isr, so it
+ +can't optimize. but when it knows what the caller does, whoopee !
+ <LaF0rge> if the power button gets pressed often accidentially (when in off
+ +mode), then we read the flash again and again and again
+block 0/OTP:
+- "sacred"
+- BT MAC
+- host key
+- as little code as possible
-- to whom do users report build failures ? [-> coreteam list]
-- need board hw revision identification procedure for "building from scratch"
- [-> coreteam list]
-- change SVN/OE version for phase 0 ? (*must* have recent SVN for BBT)
- (kernel compatibility)
- [-> Mickey's fixing "now" and stuff ]
---- Feb 15 --------------------------------------------------------------------
-
-- try s3c2410 speed set 101 [my phone stil crashes]
-- complete walk-through update/corrections
-- bbt migration: describe how to undo bad "dynenv set" (already done ?)
-- bbt migration & walk-through: clone and merge
- - nand flashing: do gradual erases (env, kernel, etc.), use partition names
- and ${filesize}
-- buy and try battery
-
-(Not much happened for a while, 'cause some flu bug had other plans for me.)
-
---- Feb 20 --------------------------------------------------------------------
-
- - #14: bootloader should display startup image before booting
- (as early as possible, i.e., even before LCM is up)
- - #40: test + debug display of image on LCM in u-boot
-- GTA01Bv2 # dynenv set u-boot_env
- 45 4e 56 30 - 00 00 00 00
- *OUCH* !
-
---- Feb 23 --------------------------------------------------------------------
-
-- prevent poweroff if starting from RAM
- [ wakeup-reason-nand-only.patch, experimental, DOESN'T WORK ]
-- u-boot: start.S: boot from RAM with relocation
- [ boot-from-ram-reloc.patch ]
-- nice to have: make u-boot detect at run-time if it's booting from RAM or NAND
- [ boot-from-ram-and-nand.patch ]
-- board/neo1973/neo1973.c: start LCD first, to avoid white flash
-- add lowlevel.S to u-boot build
-
---- Feb 25 --------------------------------------------------------------------
-
-- force console switch for boot menu
-
---- Feb 26 --------------------------------------------------------------------
-
-boot menu finalizing:
-> ok, so i'll add some default menu items to my env draft (in preparation)
-> then i'll kill the "indefinite boot delay" and require a 20% or so presence
-+of AUX while power-up to enter the boot menu
-> last but not least, the first item, "Boot" gets a poweroff on failure, so
-+that desperate users don't get even more desperate when they can't seem to
-+turn off the device (well, most likely, they'll just pull the battery, but
-+still ...)
-
+* force non-SPI: nope
+* power cycle (SD_ON, not data): nyet
+* CMD8: rien
+* exact speed: nichts
+* manual bit-banging:
+* pessimistic speed: so-so (kingston, toshiba)
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-09 01:50:11 +0100 (Fri, 09 Mar 2007)
New Revision: 1295
Added:
trunk/oe/packages/upstart/files/
trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
Modified:
trunk/oe/packages/upstart/upstart_0.3.5.bb
Log:
* add patch for SIGPWR support
* add --enable-compat to configure flags
Added: trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
===================================================================
--- trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
2007-03-09 00:32:24 UTC (rev 1294)
+++ trunk/oe/packages/upstart/files/upstart-0.3.5-pwrokfail.patch
2007-03-09 00:50:11 UTC (rev 1295)
@@ -0,0 +1,62 @@
+Index: upstart-0.3.5/init/event.h
+===================================================================
+--- upstart-0.3.5.orig/init/event.h 2007-02-09 18:28:56.000000000 +0000
++++ upstart-0.3.5/init/event.h 2007-03-09 01:43:14.000000000 +0000
+@@ -123,6 +123,13 @@
+ **/
+ #define KBDREQUEST_EVENT "kbdrequest"
+
++/**
++ * POWEROKFAIL_EVENT:
++ *
++ * Name of the event that we generate when the system power failes
++ **/
++#define POWEROKFAIL_EVENT "pwrokfail"
++
+
+ /**
+ * JOB_STARTING_EVENT:
+Index: upstart-0.3.5/init/main.c
+===================================================================
+--- upstart-0.3.5.orig/init/main.c 2007-02-09 21:14:55.000000000 +0000
++++ upstart-0.3.5/init/main.c 2007-03-09 01:44:34.000000000 +0000
+@@ -64,6 +64,7 @@
+ static void reset_console (void);
+ static void crash_handler (int signum);
+ static void cad_handler (void *data, NihSignal *signal);
++static void pof_handler (void *data, NihSignal *signal);
+ static void kbd_handler (void *data, NihSignal *signal);
+ static void stop_handler (void *data, NihSignal *signal);
+ static void term_handler (const char *prog, NihSignal *signal);
+@@ -227,6 +228,8 @@
+ reboot (RB_DISABLE_CAD);
+ NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
+
++ NIH_MUST (nih_signal_add_handler (NULL, SIGPWR, pof_handler, NULL));
++
+ /* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
+ * generate a kbdrequest event.
+ */
+@@ -396,6 +399,22 @@
+ }
+
+ /**
++ * pof_handler:
++ * @data: unused,
++ * @signal: signal that called this handler.
++ *
++ * Handle having recieved the SIGPWR signal, sent to us when the kernel
++ * detects a power failure. We just generate a
++ * pwrokfail event.
++ **/
++static void
++pof_handler (void *data,
++ NihSignal *signal)
++{
++ event_emit (POWEROKFAIL_EVENT, NULL, NULL);
++}
++
++/**
+ * kbd_handler:
+ * @data: unused,
+ * @signal: signal that called this handler.
Modified: trunk/oe/packages/upstart/upstart_0.3.5.bb
===================================================================
--- trunk/oe/packages/upstart/upstart_0.3.5.bb 2007-03-09 00:32:24 UTC (rev
1294)
+++ trunk/oe/packages/upstart/upstart_0.3.5.bb 2007-03-09 00:50:11 UTC (rev
1295)
@@ -2,17 +2,17 @@
HOMEPAGE = "http://upstart.ubuntu.com/";
SECTION = "base"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
FILESDIR = "[EMAIL PROTECTED](bb.data.getVar('FILE',d,1))}/files"
SRC_URI = "http://upstart.ubuntu.com/download/upstart-0.3.5.tar.bz2 \
+ file://upstart-0.3.5-pwrokfail.patch;patch=1 \
"
+inherit autotools
-#S = "${WORKDIR}/uucp-${PV}"
+EXTRA_OECONF = "--enable-compat=sysv"
-inherit autotools
-
do_configure() {
gnu-configize
oe_runconf
--- End Message ---
--- Begin Message ---
Author: alex_tang
Date: 2007-03-09 03:00:46 +0100 (Fri, 09 Mar 2007)
New Revision: 1296
Modified:
trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
Log:
Rearrange the New Folder and Folder Rename dialog window's button
position.
Modified:
trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
2007-03-09 00:50:11 UTC (rev 1295)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
2007-03-09 02:00:46 UTC (rev 1296)
@@ -92,6 +92,10 @@
void cb_new_folder (GtkMenuItem* item, MessengerData* d)
{
g_debug ("new folder called");
+ GtkWidget* hbox;
+ GtkWidget* nfResetBtn;
+ GtkWidget* nfConfirmBtn;
+
MokoDialogWindow* nfWin = moko_dialog_window_new();
GtkWidget* nfBox = gtk_vbox_new (FALSE,10);
gtk_widget_set_size_request (nfBox, 480, -1);
@@ -103,16 +107,16 @@
gtk_misc_set_alignment (GTK_MISC(nfLabel),0,0.5);
gtk_box_pack_start (GTK_BOX(nfBox), nfLabel, FALSE, TRUE, 0);
- GtkWidget* hbox = gtk_hbox_new (FALSE,20);
+ hbox = gtk_hbox_new (FALSE,20);
d->nfEntry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX(hbox), d->nfEntry, FALSE, TRUE, 0);
- GtkWidget* nfResetBtn = gtk_button_new_with_label ("Reset");
- gtk_box_pack_start (GTK_BOX(hbox), nfResetBtn, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), d->nfEntry, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(nfBox), hbox, FALSE, TRUE, 0);
- hbox = gtk_hbox_new (FALSE,0);
- GtkWidget* nfConfirmBtn = gtk_button_new_with_label ("OK");
+ hbox = gtk_hbox_new (FALSE,20);
+ nfConfirmBtn = gtk_button_new_with_label ("OK");
+ nfResetBtn = gtk_button_new_with_label ("Reset");
gtk_box_pack_start (GTK_BOX(hbox), nfConfirmBtn, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), nfResetBtn, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(nfBox), hbox, FALSE, TRUE, 0);
gtk_container_add (GTK_CONTAINER(nfAlign),nfBox);
@@ -298,6 +302,9 @@
g_signal_connect( G_OBJECT(menubox), "filter_changed",
G_CALLBACK(cb_filter_changed), d );
moko_menu_box_set_filter_menu(menubox, GTK_MENU(d->filtmenu));
gtk_widget_show_all (GTK_WIDGET(menubox));
+
+ GdkWindow* parent = gtk_widget_get_parent_window (GTK_WIDGET(button));
+ gdk_window_destroy (parent);
}
void cb_frResetBtn_clicked (GtkButton* button, GtkWidget* entry)
@@ -310,6 +317,7 @@
g_debug ("folder rename called");
GtkWidget* menuitem = gtk_menu_get_attach_widget (GTK_MENU(d->filtmenu));
GtkWidget* menulabel = GTK_BIN(menuitem)->child;
+
gchar* oldName = g_strdup (gtk_label_get_text (GTK_LABEL(menulabel)));
if (!g_strcasecmp(oldName,"Inbox") ||
!g_strcasecmp(oldName,"Outbox") ||
@@ -324,6 +332,10 @@
gtk_dialog_run (GTK_DIALOG (msgDialog));
gtk_widget_destroy (msgDialog);
}else {
+ GtkWidget* hbox;
+ GtkWidget* frResetBtn;
+ GtkWidget* frConfirmBtn;
+
MokoDialogWindow* frWin = moko_dialog_window_new();
GtkWidget* frBox = gtk_vbox_new (FALSE,10);
gtk_widget_set_size_request (frBox, 480, -1);
@@ -337,16 +349,14 @@
gtk_misc_set_alignment (GTK_MISC(frLabel),0,0.5);
gtk_box_pack_start (GTK_BOX(frBox), frLabel, FALSE, TRUE, 0);
- GtkWidget* hbox = gtk_hbox_new (FALSE,20);
d->frEntry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX(hbox), d->frEntry, FALSE, TRUE, 0);
- GtkWidget* frResetBtn = gtk_button_new_with_label ("Reset");
- gtk_box_pack_start (GTK_BOX(hbox), frResetBtn, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX(frBox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(frBox), d->frEntry, FALSE, TRUE, 0);
- hbox = gtk_hbox_new (FALSE,0);
- GtkWidget* frConfirmBtn = gtk_button_new_with_label ("OK");
+ hbox = gtk_hbox_new (FALSE,20);
+ frConfirmBtn = gtk_button_new_with_label ("OK");
+ frResetBtn = gtk_button_new_with_label ("Reset");
gtk_box_pack_start (GTK_BOX(hbox), frConfirmBtn, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), frResetBtn, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX(frBox), hbox, FALSE, TRUE, 0);
gtk_container_add (GTK_CONTAINER(frAlign),frBox);
--- End Message ---
--- Begin Message ---
Author: caowai_song
Date: 2007-03-09 04:17:58 +0100 (Fri, 09 Mar 2007)
New Revision: 1297
Modified:
trunk/src/target/OM-2007/applications/openmoko-keyboard/src/matchbox-keyboard-ui.c
Log:
At the realsize mode, Write the keyboard width and height to
the key_uwidth and key_uheight in the MBKeyboardUI.
Modified:
trunk/src/target/OM-2007/applications/openmoko-keyboard/src/matchbox-keyboard-ui.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-keyboard/src/matchbox-keyboard-ui.c
2007-03-09 02:00:46 UTC (rev 1296)
+++
trunk/src/target/OM-2007/applications/openmoko-keyboard/src/matchbox-keyboard-ui.c
2007-03-09 03:17:58 UTC (rev 1297)
@@ -366,6 +366,9 @@
*width = mb_kbd_layout_get_width(layout);
*height = mb_kbd_layout_get_height(layout);
+ ui->key_uwidth = *width;
+ ui->key_uheight = *height;
+
return;
}
--- End Message ---
--- Begin Message ---
Author: tony_guan
Date: 2007-03-09 04:38:11 +0100 (Fri, 09 Mar 2007)
New Revision: 1298
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
Log:
gsmd got the incoming status OK, so the previous timeout mechanism is no more
needed. the incoming disconnect can be detected immediately now.
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
2007-03-09 03:17:58 UTC (rev 1297)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
2007-03-09 03:38:11 UTC (rev 1298)
@@ -219,7 +219,7 @@
if (aux->u.call_status.prog == GSMD_CALLPROG_DISCONNECT)
{
- if (aux->u.call_status.dir == GSMD_CALL_DIR_MO)
+// if (aux->u.call_status.dir == GSMD_CALL_DIR_MO)
gsm_peer_disconnect ();
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
2007-03-09 03:17:58 UTC (rev 1297)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
2007-03-09 03:38:11 UTC (rev 1298)
@@ -158,6 +158,7 @@
gsm_hangup();
if(appdata->window_talking)gtk_widget_hide(appdata->window_talking);
if(appdata->window_outgoing)gtk_widget_hide(appdata->window_outgoing);
+ if(appdata->window_incoming)gtk_widget_hide(appdata->window_incoming);
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
2007-03-09 03:17:58 UTC (rev 1297)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
2007-03-09 03:38:11 UTC (rev 1298)
@@ -126,19 +126,9 @@
//DBG_ENTER();
TIMER_DATA *timer_data = &(appdata->g_timer_data);
-/*
-timer_data->ticks++;
-timer_data->hour=timer_data->ticks/3600;
-timer_data->min=(timer_data->ticks-timer_data->hour*3600)/60;
-timer_data->sec=timer_data->ticks%60;
-
-
-sprintf(timer_data->timestring,"%02d:%02d:%02d",timer_data->hour,timer_data->min,timer_data->sec);
-//ok,we update the label now.
-moko_dialer_status_set_status_label(appdata->status_incoming,timer_data->timestring);
-*/
moko_dialer_status_update_icon(appdata->status_incoming);
-
+//now that we have the incoming call status report correctly, the timeout
mechanism is not needed.
+/*
if (event_get_keep_calling ())
{
event_reset_keep_calling ();
@@ -163,7 +153,7 @@
timer_data->ticks++;
}
}
-
+*/
return 1;
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
