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. r1956 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r1957 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r1958 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
4. r1959 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokoui ([EMAIL PROTECTED])
5. r1960 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
6. r1961 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-05-15 12:48:06 +0200 (Tue, 15 May 2007)
New Revision: 1956
Modified:
trunk/src/target/kernel/patches/hxd8-core.patch
Log:
* HXD8: fix IRQ constant for PCF50605 IRQ (Matt Hsu)
Modified: trunk/src/target/kernel/patches/hxd8-core.patch
===================================================================
--- trunk/src/target/kernel/patches/hxd8-core.patch 2007-05-15 04:10:26 UTC
(rev 1955)
+++ trunk/src/target/kernel/patches/hxd8-core.patch 2007-05-15 10:48:06 UTC
(rev 1956)
@@ -441,6 +441,6 @@
+#define HXD8_GPIO_USB_PULLUP S3C2410_GPB9
+#define HXD8_GPIO_PCF50606 S3C2410_GPF6
+
-+#define HXD8_IRQ_PCF50606 S3C2410_GPF6_EINT6
++#define HXD8_IRQ_PCF50606 IRQ_EINT6
+
+#endif
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-15 14:16:55 +0200 (Tue, 15 May 2007)
New Revision: 1957
Modified:
trunk/src/target/kernel/patches/gta01-core.patch
Log:
* add GSM Modem wakeup IRQ handler
Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch 2007-05-15 10:48:06 UTC
(rev 1956)
+++ trunk/src/target/kernel/patches/gta01-core.patch 2007-05-15 12:16:55 UTC
(rev 1957)
@@ -31,7 +31,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,742 @@
+@@ -0,0 +1,753 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -704,6 +704,12 @@
+ s3c24xx_set_board(>a01_board);
+}
+
++static irqreturn_t gta01_modem_irq(int irq, void *param)
++{
++ printk(KERN_DEBUG "modem wakeup interrupt\n");
++ return IRQ_HANDLED;
++}
++
+static void __init gta01_machine_init(void)
+{
+ if (system_rev == GTA01v4_SYSTEM_REV ||
@@ -761,6 +767,11 @@
+ platform_device_register(>a01_led_dev);
+
+ s3c2410_pm_init();
++
++ set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
++ request_irq(GTA01_IRQ_MODEM, gta01_modem_irq,
++ SA_INTERRUPT, "modem", NULL);
++ enable_irq_wake(GTA01_IRQ_MODEM);
+}
+
+MACHINE_START(NEO1973_GTA01, "GTA01")
@@ -778,7 +789,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/include/asm-arm/arch-s3c2410/gta01.h
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,70 @@
+#ifndef _GTA01_H
+#define _GTA01_H
+
@@ -812,6 +823,7 @@
+#define GTA01_GPIO_HOLD_KEY S3C2410_GPF7
+#define GTA01_GPIO_VIBRATOR_ON S3C2410_GPG11
+
++#define GTA01_IRQ_MODEM IRQ_EINT1
+#define GTA01_IRQ_JACK_INSERT IRQ_EINT4
+#define GTA01_IRQ_nSD_DETECT IRQ_EINT5
+#define GTA01_IRQ_AUX_KEY IRQ_EINT6
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-15 14:25:08 +0200 (Tue, 15 May 2007)
New Revision: 1958
Modified:
trunk/src/target/kernel/patches/gta01-power_control.patch
Log:
add power_vdd_core_1v5 as temporary kludge to support broken old GLL with wrong
syfs filename
Modified: trunk/src/target/kernel/patches/gta01-power_control.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-power_control.patch 2007-05-15
12:16:55 UTC (rev 1957)
+++ trunk/src/target/kernel/patches/gta01-power_control.patch 2007-05-15
12:25:08 UTC (rev 1958)
@@ -11,7 +11,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/arch/arm/common/gta01_pm_gps.c
-@@ -0,0 +1,552 @@
+@@ -0,0 +1,558 @@
+/*
+ * GPS Power Management code for the FIC Neo1973 GSM Phone
+ *
@@ -325,7 +325,8 @@
+ ret = gps_power_3v3_get();
+ } else if (!strcmp(attr->attr.name, "power_pll_core_2v5")) {
+ ret = gps_power_2v5_get();
-+ } else if (!strcmp(attr->attr.name, "power_core_1v5")) {
++ } else if (!strcmp(attr->attr.name, "power_core_1v5") ||
++ !strcmp(attr->attr.name, "power_vdd_core_1v5")) {
+ ret = gps_power_1v5_get();
+ }
+
@@ -353,7 +354,8 @@
+ gps_power_3v3_set(on);
+ } else if (!strcmp(attr->attr.name, "power_pll_core_2v5")) {
+ gps_power_2v5_set(on);
-+ } else if (!strcmp(attr->attr.name, "power_core_1v5")) {
++ } else if (!strcmp(attr->attr.name, "power_core_1v5") ||
++ !strcmp(attr->attr.name, "power_vdd_core_1v5")) {
+ gps_power_1v5_set(on);
+ }
+
@@ -445,6 +447,7 @@
+static DEVICE_ATTR(power_lp_io_3v3, 0644, power_gps_read, power_gps_write);
+static DEVICE_ATTR(power_pll_core_2v5, 0644, power_gps_read, power_gps_write);
+static DEVICE_ATTR(power_core_1v5, 0644, power_gps_read, power_gps_write);
++static DEVICE_ATTR(power_vdd_core_1v5, 0644, power_gps_read, power_gps_write);
+static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
power_sequence_write);
+
+#ifdef CONFIG_PM
@@ -475,8 +478,9 @@
+ &dev_attr_power_lp_io_3v3.attr,
+ &dev_attr_power_pll_core_2v5.attr,
+ &dev_attr_power_sequence.attr,
-+ NULL,
-+ NULL
++ NULL, /* power_core_1v5 */
++ NULL, /* power_vdd_core_1v5 */
++ NULL /* terminating entry */
+};
+
+static struct attribute_group gta01_gps_attr_group = {
@@ -522,8 +526,10 @@
+ break;
+ case GTA01Bv3_SYSTEM_REV:
+ case GTA01Bv4_SYSTEM_REV:
++ gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
++
&dev_attr_power_core_1v5.attr;
+ gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
-+
&dev_attr_power_core_1v5.attr;
++
&dev_attr_power_vdd_core_1v5.attr;
+ break;
+ }
+
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-15 16:47:19 +0200 (Tue, 15 May 2007)
New Revision: 1959
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
Log:
* libmokoui/moko-message-dialog.c: (moko_message_dialog_map): Check for
NULL before using g_object_unref(), as the inbuilt assertion is not
available in openembedded.
* libmokoui/moko-stock.c:
* libmokoui/moko-stock.h:
Add two more stock items
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-15 12:25:08 UTC
(rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-15 14:47:19 UTC
(rev 1959)
@@ -1,3 +1,12 @@
+2007-05-15 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-message-dialog.c: (moko_message_dialog_map): Check for
+ NULL before using g_object_unref(), as the inbuilt assertion is not
+ available in openembedded.
+ * libmokoui/moko-stock.c:
+ * libmokoui/moko-stock.h:
+ Add two more stock items
+
2007-05-10 Thomas Wood <[EMAIL PROTECTED]>
* libmokogsmd/moko-gsmd-connection.h: Include gsmd/error.h (for enums)
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-05-15 12:25:08 UTC (rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-05-15 14:47:19 UTC (rev 1959)
@@ -125,10 +125,14 @@
old_pixbuf = priv->root_pixbuf;
priv->root_pixbuf = root_pixbuf;
- g_object_unref (old_pixbuf);
+ if (old_pixbuf)
+ g_object_unref (old_pixbuf);
- g_object_unref (priv->pixbuf);
- priv->pixbuf = NULL;
+ if (priv->pixbuf)
+ {
+ g_object_unref (priv->pixbuf);
+ priv->pixbuf = NULL;
+ }
if (GTK_WIDGET_CLASS (moko_message_dialog_parent_class)->map)
GTK_WIDGET_CLASS (moko_message_dialog_parent_class)->map (object);
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
2007-05-15 12:25:08 UTC (rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
2007-05-15 14:47:19 UTC (rev 1959)
@@ -26,9 +26,11 @@
static const GtkStockItem moko_items [] =
{
+ { MOKO_STOCK_CALL_ANSWER, N_("Answer"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_HANGUP, N_("Hang Up"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_HOLD, N_("Hold"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CALL_REDIAL, N_("Redial"), 0, 0, GETTEXT_PACKAGE },
+ { MOKO_STOCK_CALL_REJECT, N_("Reject"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CONTACT_ADDRESS, N_("Address"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CONTACT_DELETE, N_("Delete Contact"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_CONTACT_EMAIL, N_("E-Mail"), 0, 0, GETTEXT_PACKAGE },
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
2007-05-15 12:25:08 UTC (rev 1958)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
2007-05-15 14:47:19 UTC (rev 1959)
@@ -35,9 +35,11 @@
#ifndef _MOKO_STOCK_H_
#define _MOKO_STOCK_H_
+#define MOKO_STOCK_CALL_ANSWER "moko-stock-call-answer"
#define MOKO_STOCK_CALL_HANGUP "moko-stock-call-hangup"
#define MOKO_STOCK_CALL_HOLD "moko-stock-call-hold"
#define MOKO_STOCK_CALL_REDIAL "moko-stock-call-redial"
+#define MOKO_STOCK_CALL_REJECT "moko-stock-call-reject"
#define MOKO_STOCK_CONTACT_ADDRESS "moko-stock-contact-address"
#define MOKO_STOCK_CONTACT_DELETE "moko-stock-contact-delete"
#define MOKO_STOCK_CONTACT_EMAIL "moko-stock-contact-email"
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-15 18:14:05 +0200 (Tue, 15 May 2007)
New Revision: 1960
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h
Log:
* openmoko-dialer/src/dialer-window-dialer.c:
* openmoko-dialer/src/dialer-window-incoming.c:
* openmoko-dialer/src/dialer-callbacks-connection.c:
* openmoko-dialer/src/dialer-window-incoming.h:
* openmoko-dialer/src/dialer-callbacks-connection.h:
* openmoko-dialer/src/dialer-main.c:
* openmoko-dialer/src/dialer-main.h:
Open a message window on incoming call signal
* openmoko-dialer/src/dialer-window-history.c: Don't try to read the journal if
it doesn't exist
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
2007-05-15 14:47:19 UTC (rev 1959)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c
2007-05-15 16:14:05 UTC (rev 1960)
@@ -1,4 +1,6 @@
+
#include "dialer-callbacks-connection.h"
+#include "dialer-window-incoming.h"
void
@@ -8,9 +10,10 @@
}
void
-incoming_call_cb (MokoGsmdConnection *self, int type)
+incoming_call_cb (MokoGsmdConnection *self, int type, MokoDialerData *data)
{
/* incoming call */
+ window_incoming_show (data);
}
void
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
2007-05-15 14:47:19 UTC (rev 1959)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h
2007-05-15 16:14:05 UTC (rev 1960)
@@ -1,6 +1,12 @@
+#ifndef _DIALER_CALLBACKS_CONNECTION_H
+#define _DIALER_CALLBACKS_CONNECTION_H
+
#include <libmokogsmd/moko-gsmd-connection.h>
+#include <dialer-main.h>
void network_registration_cb (MokoGsmdConnection *self, int type, int lac, int
cell);
-void incoming_call_cb (MokoGsmdConnection *self, int type);
+void incoming_call_cb (MokoGsmdConnection *self, int type, MokoDialerData
*data);
void incoming_clip_cb (MokoGsmdConnection *self, const char *number);
+
+#endif
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
2007-05-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c
2007-05-15 16:14:05 UTC (rev 1960)
@@ -15,11 +15,7 @@
*
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
-#include <libmokoui/moko-application.h>
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-
+#include <libmokoui/moko-ui.h>
#include <libmokogsmd/moko-gsmd-connection.h>
@@ -185,9 +181,9 @@
/* Set up gsmd connection object */
MokoGsmdConnection* conn = p_dialer_data->connection =
moko_gsmd_connection_new ();
- g_signal_connect (G_OBJECT (conn), "network-registration", (GCallback)
network_registration_cb, NULL);
- g_signal_connect (G_OBJECT (conn), "incoming-call", (GCallback)
incoming_call_cb, NULL);
- g_signal_connect (G_OBJECT (conn), "incoming-clip", (GCallback)
incoming_clip_cb, NULL);
+ g_signal_connect (G_OBJECT (conn), "network-registration", (GCallback)
network_registration_cb, p_dialer_data);
+ g_signal_connect (G_OBJECT (conn), "incoming-call", (GCallback)
incoming_call_cb, p_dialer_data);
+ g_signal_connect (G_OBJECT (conn), "incoming-clip", (GCallback)
incoming_clip_cb, p_dialer_data);
/* Set up journal handling */
p_dialer_data->journal = moko_journal_open_default ();
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
2007-05-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
2007-05-15 16:14:05 UTC (rev 1960)
@@ -15,6 +15,10 @@
*
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
+
+#ifndef _DIALER_MAIN_H_
+#define _DIALER_MAIN_H_
+
#include "moko-dialer-includes.h"
#include <libmokogsmd/moko-gsmd-connection.h>
#include <libmokojournal/moko-journal.h>
@@ -90,3 +94,5 @@
GdkPixbuf *g_iconReceived, *g_iconMissed, *g_iconDialed; ///<the global
pixbuf for the 3 icons displayed in the history window.}DIALER_APP_DATA;
} MokoDialerData;
+
+#endif
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-05-15 14:47:19 UTC (rev 1959)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-05-15 16:14:05 UTC (rev 1960)
@@ -100,7 +100,12 @@
{
gchar *number;
number = moko_dialer_textview_get_input (appdata->moko_dialer_text_view,
TRUE);
- g_debug ("Dialing: %s", number);
+ if (!number)
+ {
+ /* show the history window if no number entered */
+ gtk_widget_show_all (appdata->window_history);
+ return;
+ }
window_outgoing_dial (appdata, number);
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-05-15 14:47:19 UTC (rev 1959)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-05-15 16:14:05 UTC (rev 1960)
@@ -650,6 +650,10 @@
j_entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
+ /* Bail out if we couldn't get the entry. Do we need to display a warning
here? */
+ if (!j_entry)
+ return 0;
+
while (moko_journal_get_entry_at (p_dialer_data->journal, i, &j_entry))
{
const gchar *uid, *number;
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
2007-05-15 14:47:19 UTC (rev 1959)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
2007-05-15 16:14:05 UTC (rev 1960)
@@ -16,20 +16,9 @@
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-#include <libmokoui/moko-pixmap-button.h>
+#include <libmokoui/moko-ui.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
-
+#include <gtk/gtk.h>
#include "contacts.h"
#include "dialer-main.h"
#include "moko-dialer-status.h"
@@ -207,75 +196,27 @@
appdata->g_state.callstate = STATE_INCOMING;
window_incoming_setup_timer (appdata);
DBG_LEAVE ();
-} gint window_incoming_init (MokoDialerData * p_dialer_data)
-{
- DBG_ENTER ();
- MokoFingerWindow * window;
- GtkWidget * vbox;
- GtkWidget * status;
- if (p_dialer_data->window_incoming == 0)
-
- {
- vbox = gtk_vbox_new (FALSE, 0);
- status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
- "incoming_0.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
- "incoming_1.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
- "incoming_2.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
- "incoming_3.png");
- moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
- gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
- GtkWidget * hbox2 = gtk_hbox_new (FALSE, 0);
- GtkWidget * button = gtk_button_new_with_label ("Answer");
- gtk_button_set_image (GTK_BUTTON (button),
- file_new_image_from_relative_path ("answer.png"));
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_answer_button_clicked), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
- 10);
- button = gtk_button_new_with_label ("Ignore");
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_ignore_button_clicked), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
- 10);
- button = gtk_button_new_with_label ("Reject");
- gtk_button_set_image (GTK_BUTTON (button),
- file_new_image_from_relative_path ("cancel.png"));
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_reject_button_clicked), p_dialer_data);
- gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
- 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
-
-//currently MokoDialogWindow is not finished, wating...
-// MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
-// moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
- window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
-
- //FIXME: dear thomas, I know that show & hide is not good, but when you
removed the following 2 lines, the incoming window
- //is simply not displaying well. please have a try and then commit. If
you cannot test the incoming window, you can simply modify the code to show it
out debuggingly.
- //Pardon me to re-add the 2 lines. Tony Guan 14,3,2007
- gtk_widget_show_all (GTK_WIDGET (window));
- gtk_widget_hide (GTK_WIDGET (window));
- moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
- "Incoming call");
- moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "");
- p_dialer_data->window_incoming = GTK_WIDGET (window);
- p_dialer_data->status_incoming = MOKO_DIALER_STATUS (status);
-
-//
DBG_MESSAGE("p_dialer_data->status_incoming=0X%x",p_dialer_data->status_incoming);
- g_signal_connect ((gpointer) window, "show",
- G_CALLBACK (on_window_incoming_show),
- p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_incoming_hide), p_dialer_data);
- }
- DBG_LEAVE ();
- return 1;
}
+void
+window_incoming_init (MokoDialerData * p_dialer_data)
+{
+ GtkWidget * window;
+ if (p_dialer_data->window_incoming)
+ return;
+
+ window = moko_message_dialog_new ();
+
+ gtk_dialog_add_button (GTK_DIALOG (window), MOKO_STOCK_CALL_ANSWER,
GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (window), MOKO_STOCK_CALL_REJECT,
GTK_RESPONSE_OK);
+ moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (window), "Incoming
Call");
+
+}
+
+void
+window_incoming_show (MokoDialerData *data)
+{
+ gtk_dialog_run (data->window_incoming);
+ gtk_widget_hide (data->window_incoming);
+}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h
2007-05-15 14:47:19 UTC (rev 1959)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h
2007-05-15 16:14:05 UTC (rev 1960)
@@ -15,26 +15,14 @@
*
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
-#include "moko-dialer-includes.h"
#ifndef _OPENMOKO_DIALER_WINDOW_INCOMING_H
#define _OPENMOKO_DIALER_WINDOW_INCOMING_H
-#ifdef __cplusplus
+#include "dialer-main.h"
+void window_incoming_init (MokoDialerData * p_dialer_data);
+void window_incoming_prepare (MokoDialerData * appdata);
+void window_incoming_show (MokoDialerData *data);
-
-extern "C"
-{
#endif
-
-
-
- gint window_incoming_init (MokoDialerData * p_dialer_data);
-
- void window_incoming_prepare (MokoDialerData * appdata);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-16 11:35:40 +0200 (Wed, 16 May 2007)
New Revision: 1961
Added:
trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch
Log:
fix upstream compile error in cmd_mfsl.c (header file is gone)
Added: trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch 2007-05-15
16:14:05 UTC (rev 1960)
+++ trunk/src/target/u-boot/patches/uboot-20070516-mfsl.patch 2007-05-16
09:35:40 UTC (rev 1961)
@@ -0,0 +1,12 @@
+Index: u-boot/common/cmd_mfsl.c
+===================================================================
+--- u-boot.orig/common/cmd_mfsl.c
++++ u-boot/common/cmd_mfsl.c
+@@ -29,7 +29,6 @@
+ #include <common.h>
+ #include <config.h>
+ #include <command.h>
+-#include <asm/asm.h>
+
+ #if (CONFIG_COMMANDS & CFG_CMD_MFSL)
+
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
