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. r1944 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
2. r1945 - in trunk/src/target/OM-2007/openmoko-libs: .
libmokogsmd libmokoui ([EMAIL PROTECTED])
3. r1946 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
4. r1947 - trunk/oe/packages/uboot ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-05-10 13:55:54 +0200 (Thu, 10 May 2007)
New Revision: 1944
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
Log:
openmoko-dialer: implement dialing, redialing, call success, call failure
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-10 07:05:29 UTC (rev 1943)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h
2007-05-10 11:55:54 UTC (rev 1944)
@@ -60,8 +60,9 @@
//buttons
GtkWidget *buttonSpeaker;
+ GtkWidget *buttonHandset;
+ GtkWidget *buttonRedial;
GtkWidget *buttonCancel;
- GtkWidget *buttonRedial;
GtkWidget *imageTALK;
GtkWidget *imageDTMF;
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
2007-05-10 07:05:29 UTC (rev 1943)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
2007-05-10 11:55:54 UTC (rev 1944)
@@ -33,43 +33,28 @@
static void window_outgoing_setup_timer (MokoDialerData * appdata);
static void
-cb_speaker_button_clicked (GtkButton * button, MokoDialerData * appdata)
+cb_speaker_button_clicked (GtkButton * button, MokoDialerData * data)
{
- DBG_ENTER ();
- //moko_dialer_status_update_icon(appdata->status_outgoing);
+ if (GTK_WIDGET_VISIBLE (data->buttonSpeaker))
+ gtk_widget_show (data->buttonHandset);
+ else
+ gtk_widget_show (data->buttonSpeaker);
-
- appdata->g_state.callstate = STATE_TALKING;
-
- gtk_widget_hide (appdata->window_outgoing);
-
-
- //transfer the contact info
- window_talking_prepare (appdata);
-
- //start dialling.
-
+ gtk_widget_hide (button);
+ // do something else here too
}
static void
-cb_redial_button_clicked (GtkButton * button, MokoDialerData * appdata)
+cb_redial_button_clicked (GtkButton * button, MokoDialerData * data)
{
- DBG_ENTER ();
- gtk_widget_hide (appdata->buttonRedial);
- gtk_widget_show (appdata->buttonSpeaker);
- moko_dialer_status_set_title_label (appdata->status_outgoing,
- "Outgoing call");
- moko_dialer_status_set_status_label (appdata->status_outgoing,
- "Calling ... (00:00:00)");
- window_outgoing_setup_timer (appdata);
+ gchar *number = g_object_get_data (G_OBJECT (button), "current-number");
- appdata->g_state.callstate = STATE_CALLING;
- //appdata->g_state.historytype = OUTGOING;
- /* TOOD: MokoGsmdConnection->dial
- * gsm_dial (appdata->g_peer_info.number);
- */
+ gtk_widget_hide (button);
+ gtk_widget_show (data->buttonCancel);
- DBG_LEAVE ();
+
+ moko_gsmd_connection_voice_hangup (data->connection);
+ moko_gsmd_connection_voice_dial (data->connection, number);
}
static void
@@ -209,9 +194,9 @@
"outgoing_2.png");
moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
"outgoing_3.png");
- moko_dialer_status_set_error_icon (MOKO_DIALER_STATUS (status),
- "failure.png");
- moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
+ //moko_dialer_status_set_error_icon (MOKO_DIALER_STATUS (status),
+ // "failure.png");
+ //moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
@@ -227,24 +212,24 @@
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_speaker_button_clicked), p_dialer_data);
p_dialer_data->buttonSpeaker = button;
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button,
FALSE, FALSE, 0);
+ gtk_widget_show (button);
+ button = gtk_button_new_from_stock (MOKO_STOCK_HANDSET);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (cb_speaker_button_clicked), p_dialer_data);
+ p_dialer_data->buttonHandset = button;
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button,
FALSE, FALSE, 0);
+
+
button = gtk_button_new_from_stock (MOKO_STOCK_CALL_REDIAL);
p_dialer_data->buttonRedial = button;
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (cb_redial_button_clicked), p_dialer_data);
- g_object_set (G_OBJECT (button), "no-show-all", TRUE, NULL);
+ p_dialer_data->buttonCancel = gtk_dialog_add_button (GTK_DIALOG (window),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- p_dialer_data->buttonCancel = button;
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (cb_cancel_button_clicked), p_dialer_data);
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
p_dialer_data->buttonSpeaker, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area),
p_dialer_data->buttonCancel, FALSE, FALSE, 0);
-
-
moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
"Outgoing call");
moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status),
@@ -264,8 +249,39 @@
}
void
-window_outgoing_dial (MokoDialerData *appdata, gchar *number)
+call_progress_cb (MokoGsmdConnection *connection, int type, MokoDialerData
*data)
{
- moko_gsmd_connection_voice_dial (appdata->connection, number);
- gtk_dialog_run (appdata->window_outgoing);
+ if (type == GSMD_CALLPROG_REJECT)
+ {
+ g_debug ("call rejected");
+ return;
+ }
+
+ if (type == GSMD_CALLPROG_CONNECTED)
+ {
+ gtk_dialog_response (data->window_outgoing, GTK_RESPONSE_OK);
+ }
}
+
+void
+window_outgoing_dial (MokoDialerData *data, gchar *number)
+{
+ g_signal_connect (data->connection, "call-progress", call_progress_cb, data);
+ g_object_set_data (G_OBJECT (data->window_outgoing), "current-number",
number);
+ moko_gsmd_connection_voice_dial (data->connection, number);
+ if (gtk_dialog_run (data->window_outgoing) == GTK_RESPONSE_OK)
+ {
+ /* call has connected, so open the talking window */
+ /* window_talking_show (); */
+ window_talking_prepare (data);
+ gtk_widget_show (data->window_talking);
+ }
+ else
+ {
+ /* call canceled */
+ moko_gsmd_connection_voice_hangup (data->connection);
+ }
+
+ gtk_widget_hide (data->window_outgoing);
+ g_object_steal_data (G_OBJECT (data->window_outgoing), "current-number");
+}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-10 15:54:47 +0200 (Thu, 10 May 2007)
New Revision: 1945
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
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:
* libmokogsmd/moko-gsmd-connection.h: Include gsmd/error.h (for enums)
* libmokoui/moko-message-dialog.c:
(moko_message_dialog_realize_cb): Add some error trapping
* libmokoui/moko-stock.c:
* libmokoui/moko-stock.h: Add MOKO_STOCK_HANDSET
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-10 11:55:54 UTC
(rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-10 13:54:47 UTC
(rev 1945)
@@ -1,3 +1,11 @@
+2007-05-10 Thomas Wood <[EMAIL PROTECTED]>
+
+ * libmokogsmd/moko-gsmd-connection.h: Include gsmd/error.h (for enums)
+ * libmokoui/moko-message-dialog.c:
+ (moko_message_dialog_realize_cb): Add some error trapping
+ * libmokoui/moko-stock.c:
+ * libmokoui/moko-stock.h: Add MOKO_STOCK_HANDSET
+
2007-05-09 Thomas Wood <[EMAIL PROTECTED]>
* libmokoui/moko-message-dialog.c:
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
2007-05-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.h
2007-05-10 13:54:47 UTC (rev 1945)
@@ -19,6 +19,7 @@
#define _MOKO_GSMD_CONNECTION_H_
#include <glib-object.h>
+#include <gsmd/event.h>
G_BEGIN_DECLS
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-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-message-dialog.c
2007-05-10 13:54:47 UTC (rev 1945)
@@ -205,8 +205,15 @@
if (priv->background_pixbuf == NULL)
{
- g_warning ("Error loading background pixbuf: %s", error->message);
- g_clear_error (&error);
+ if (error)
+ {
+ g_warning ("Error loading background pixbuf: %s", error->message);
+ g_clear_error (&error);
+ }
+ else
+ {
+ g_warning ("Error loading background pixbuf");
+ }
return;
}
}
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-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.c
2007-05-10 13:54:47 UTC (rev 1945)
@@ -47,6 +47,7 @@
{ MOKO_STOCK_PHONE_BOOK, N_("Phone Book"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_SMS_NEW, N_("New SMS"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_SPEAKER, N_("Speaker"), 0, 0, GETTEXT_PACKAGE },
+ { MOKO_STOCK_HANDSET, N_("Handset"), 0, 0, GETTEXT_PACKAGE },
{ MOKO_STOCK_VIEW, N_("View"), 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-10 11:55:54 UTC (rev 1944)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-stock.h
2007-05-10 13:54:47 UTC (rev 1945)
@@ -56,6 +56,7 @@
#define MOKO_STOCK_PHONE_BOOK "moko-stock-phone-book"
#define MOKO_STOCK_SMS_NEW "moko-stock-new-sms"
#define MOKO_STOCK_SPEAKER "moko-stock-speaker"
+#define MOKO_STOCK_HANDSET "moko-stock-handset"
#define MOKO_STOCK_VIEW "moko-stock-view"
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-10 17:48:45 +0200 (Thu, 10 May 2007)
New Revision: 1946
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
Log:
openmoko-dialer: Display number and icon in outgoing window
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
2007-05-10 13:54:47 UTC (rev 1945)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c
2007-05-10 15:48:45 UTC (rev 1946)
@@ -202,8 +202,7 @@
/* Set up window */
window = moko_message_dialog_new ();
- moko_message_dialog_set_image_from_stock (MOKO_MESSAGE_DIALOG (window),
"connecting");
- moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (window), "Calling
... ");
+ moko_message_dialog_set_image (MOKO_MESSAGE_DIALOG (window),
gtk_image_new_from_file (PKGDATADIR G_DIR_SEPARATOR_S "outgoing_1.png"));
gtk_window_set_title (GTK_WINDOW (window), "Outgoing Call");
@@ -269,6 +268,7 @@
g_signal_connect (data->connection, "call-progress", call_progress_cb, data);
g_object_set_data (G_OBJECT (data->window_outgoing), "current-number",
number);
moko_gsmd_connection_voice_dial (data->connection, number);
+ moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG
(data->window_outgoing), "Calling %s", number);
if (gtk_dialog_run (data->window_outgoing) == GTK_RESPONSE_OK)
{
/* call has connected, so open the talking window */
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-11 10:16:15 +0200 (Fri, 11 May 2007)
New Revision: 1947
Modified:
trunk/oe/packages/uboot/uboot-gta01_svn.bb
Log:
* make sure lowlevel_foo.bin ends up in DEPLOY_DIR for non-neo1973
* don't build u-boot for gta01v3 / gta01v4
Modified: trunk/oe/packages/uboot/uboot-gta01_svn.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-05-10 15:48:45 UTC (rev
1946)
+++ trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-05-11 08:16:15 UTC (rev
1947)
@@ -4,7 +4,7 @@
SECTION = "bootloader"
PRIORITY = "optional"
PV = "1.2.0+svn${SRCDATE}"
-PR = "r6"
+PR = "r7"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
@@ -16,7 +16,7 @@
EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
TARGET_LDFLAGS = ""
-UBOOT_MACHINES = "gta01v3 gta01v4 gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8"
do_quilt() {
mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
@@ -44,8 +44,8 @@
oe_runmake clean
oe_runmake all
mv u-boot.bin u-boot_${mach}.bin
- if [ -f board/neo1973/lowlevel_foo.bin ]; then
- mv board/neo1973/lowlevel_foo.bin
lowlevel_foo_${mach}.bin
+ if [ -f board/${mach}/lowlevel_foo.bin ]; then
+ mv board/${mach}/lowlevel_foo.bin
lowlevel_foo_${mach}.bin
fi
done
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
