r2058 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Tue May 22 13:15:35 CEST 2007
Author: thomas
Date: 2007-05-22 13:15:33 +0200 (Tue, 22 May 2007)
New Revision: 2058
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
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-outgoing.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
Log:
Patch by Neil J Patel <njp at o-hand.com>
openmoko-dialer: fix compiler warnings and some formatting/logic clean up
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.c 2007-05-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/alsa.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -23,7 +23,7 @@
static snd_mixer_elem_t *pcm_element = NULL;
static snd_mixer_t *mixer = NULL;
-static mixer_start = TRUE;;
+static gboolean mixer_start = TRUE;
static guint mixer_timeout;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-05-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -18,6 +18,8 @@
#include "contacts.h"
#include "config.h"
+#include <string.h>
+
/**
* @brief initialze the contact list, this will be called from outside, contactlist
*/
@@ -206,7 +208,7 @@
DIALER_CONTACT *
-contact_new_contact (char *name, char *id)
+contact_new_contact (const char *name, const char *id)
{
DIALER_CONTACT *nextcontact;
@@ -236,7 +238,8 @@
DIALER_CONTACT_ENTRY *
-contact_add_entry (DIALER_CONTACT * contact, char *desc, char *content)
+contact_add_entry (DIALER_CONTACT * contact, const char *desc,
+ const char *content)
{
DIALER_CONTACT_ENTRY *nextentry;
@@ -320,8 +323,8 @@
EContact *contact = E_CONTACT (c->data);
dialercontact = 0;
// printf("id=%s\n",e_contact_get_const(contact,E_CONTACT_UID));
- gchar *name_or_org = e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG);
- gchar *phone;
+ const gchar *name_or_org = e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG);
+ const gchar *phone;
if ((!name_or_org) || (g_utf8_strlen (name_or_org, -1) <= 0))
name_or_org = "Unnamed";
if (name_or_org)
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-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -183,7 +183,7 @@
char input[2];
input[0] = parac;
input[1] = 0;
- gchar *codesinput = NULL;
+ // gchar *codesinput = NULL;
//DBG_TRACE();
MokoDialerData *appdata = (MokoDialerData *) user_data;
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-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -657,7 +657,8 @@
while (moko_journal_get_entry_at (p_dialer_data->journal, i, &j_entry))
{
const gchar *uid, *number;
- gchar *icon_name, *display_text;
+ gchar *icon_name;
+ const gchar *display_text;
int dstart;
enum MessageDirection direction;
gboolean was_missed;
@@ -757,101 +758,99 @@
static GtkWidget *
history_create_menu_history (MokoDialerData * p_dialer_data)
{
- if (!p_dialer_data->menu_history)
- {
- GtkWidget *menu_history;
- GtkWidget *all_calls;
- GtkWidget *imageAll;
- GtkWidget *separator1;
- GtkWidget *missed_calls;
- GtkWidget *imageMissed;
- GtkWidget *separator3;
- GtkWidget *dialed_calls;
- GtkWidget *imageDialed;
- GtkWidget *separator2;
- GtkWidget *received_calls;
- GtkWidget *imageReceived;
+ GtkWidget *menu_history;
+ GtkWidget *all_calls;
+ GtkWidget *imageAll;
+ GtkWidget *separator1;
+ GtkWidget *missed_calls;
+ GtkWidget *imageMissed;
+ GtkWidget *separator3;
+ GtkWidget *dialed_calls;
+ GtkWidget *imageDialed;
+ GtkWidget *separator2;
+ GtkWidget *received_calls;
+ GtkWidget *imageReceived;
- menu_history = gtk_menu_new ();
- gtk_container_set_border_width (GTK_CONTAINER (menu_history), 2);
+ if (p_dialer_data->menu_history)
+ return p_dialer_data->menu_history;
+
+
+ menu_history = gtk_menu_new ();
+ gtk_container_set_border_width (GTK_CONTAINER (menu_history), 2);
- all_calls = gtk_image_menu_item_new_with_mnemonic (("Calls All"));
- gtk_widget_show (all_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), all_calls);
- gtk_widget_set_size_request (all_calls, 250, 60);
+ all_calls = gtk_image_menu_item_new_with_mnemonic (("Calls All"));
+ gtk_widget_show (all_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), all_calls);
+ gtk_widget_set_size_request (all_calls, 250, 60);
- imageAll = file_new_image_from_relative_path ("all.png");
- gtk_widget_show (imageAll);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (all_calls), imageAll);
+ imageAll = file_new_image_from_relative_path ("all.png");
+ gtk_widget_show (imageAll);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (all_calls), imageAll);
- separator1 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator1);
- gtk_container_add (GTK_CONTAINER (menu_history), separator1);
- gtk_widget_set_size_request (separator1, 120, -1);
- gtk_widget_set_sensitive (separator1, FALSE);
+ separator1 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator1);
+ gtk_container_add (GTK_CONTAINER (menu_history), separator1);
+ gtk_widget_set_size_request (separator1, 120, -1);
+ gtk_widget_set_sensitive (separator1, FALSE);
- missed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Missed "));
- gtk_widget_show (missed_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), missed_calls);
- gtk_widget_set_size_request (missed_calls, 120, 60);
+ missed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Missed "));
+ gtk_widget_show (missed_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), missed_calls);
+ gtk_widget_set_size_request (missed_calls, 120, 60);
- //imageMissed = gtk_image_new_from_stock ("gtk-goto-bottom", GTK_ICON_SIZE_MENU);
- imageMissed = file_new_image_from_relative_path ("missed.png");
+ //imageMissed = gtk_image_new_from_stock ("gtk-goto-bottom", GTK_ICON_SIZE_MENU);
+ imageMissed = file_new_image_from_relative_path ("missed.png");
+ gtk_widget_show (imageMissed);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (missed_calls),
+ imageMissed);
- gtk_widget_show (imageMissed);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (missed_calls),
- imageMissed);
+ separator3 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator3);
+ gtk_container_add (GTK_CONTAINER (menu_history), separator3);
+ gtk_widget_set_size_request (separator3, 120, -1);
+ gtk_widget_set_sensitive (separator3, FALSE);
- separator3 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator3);
- gtk_container_add (GTK_CONTAINER (menu_history), separator3);
- gtk_widget_set_size_request (separator3, 120, -1);
- gtk_widget_set_sensitive (separator3, FALSE);
+ dialed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Dialed"));
+ gtk_widget_show (dialed_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), dialed_calls);
+ gtk_widget_set_size_request (dialed_calls, 120, 60);
- dialed_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Dialed"));
- gtk_widget_show (dialed_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), dialed_calls);
- gtk_widget_set_size_request (dialed_calls, 120, 60);
+ // imageDialed = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
+ imageDialed = file_new_image_from_relative_path ("dialed.png");
+ gtk_widget_show (imageDialed);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (dialed_calls),
+ imageDialed);
- // imageDialed = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
- imageDialed = file_new_image_from_relative_path ("dialed.png");
- gtk_widget_show (imageDialed);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (dialed_calls),
- imageDialed);
+ separator2 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator2);
+ gtk_container_add (GTK_CONTAINER (menu_history), separator2);
+ gtk_widget_set_size_request (separator2, 120, -1);
+ gtk_widget_set_sensitive (separator2, FALSE);
- separator2 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator2);
- gtk_container_add (GTK_CONTAINER (menu_history), separator2);
- gtk_widget_set_size_request (separator2, 120, -1);
- gtk_widget_set_sensitive (separator2, FALSE);
+ received_calls = gtk_image_menu_item_new_with_mnemonic (("Calls Received "));
+ gtk_widget_show (received_calls);
+ gtk_container_add (GTK_CONTAINER (menu_history), received_calls);
+ gtk_widget_set_size_request (received_calls, 120, 60);
- received_calls =
- gtk_image_menu_item_new_with_mnemonic (("Calls Received "));
- gtk_widget_show (received_calls);
- gtk_container_add (GTK_CONTAINER (menu_history), received_calls);
- gtk_widget_set_size_request (received_calls, 120, 60);
+ // imageReceived = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU);
+ imageReceived = file_new_image_from_relative_path ("received.png");
+ gtk_widget_show (imageReceived);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (received_calls),
+ imageReceived);
-// imageReceived = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU);
- imageReceived = file_new_image_from_relative_path ("received.png");
- gtk_widget_show (imageReceived);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (received_calls),
- imageReceived);
+ g_signal_connect ((gpointer) all_calls, "activate",
+ G_CALLBACK (on_all_calls_activate), p_dialer_data);
+ g_signal_connect ((gpointer) missed_calls, "activate",
+ G_CALLBACK (on_missed_calls_activate), p_dialer_data);
+ g_signal_connect ((gpointer) dialed_calls, "activate",
+ G_CALLBACK (on_dialed_calls_activate), p_dialer_data);
+ g_signal_connect ((gpointer) received_calls, "activate",
+ G_CALLBACK (on_received_calls_activate), p_dialer_data);
- g_signal_connect ((gpointer) all_calls, "activate",
- G_CALLBACK (on_all_calls_activate), p_dialer_data);
- g_signal_connect ((gpointer) missed_calls, "activate",
- G_CALLBACK (on_missed_calls_activate), p_dialer_data);
- g_signal_connect ((gpointer) dialed_calls, "activate",
- G_CALLBACK (on_dialed_calls_activate), p_dialer_data);
- g_signal_connect ((gpointer) received_calls, "activate",
- G_CALLBACK (on_received_calls_activate), p_dialer_data);
+ p_dialer_data->menu_history = menu_history;
- p_dialer_data->menu_history = menu_history;
- return menu_history;
- }
- else
- return p_dialer_data->menu_history;
+ return menu_history;
}
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-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -19,6 +19,7 @@
#include <libmokoui/moko-ui.h>
#include <gtk/gtk.h>
+#include <string.h>
#include "contacts.h"
#include "dialer-main.h"
#include "moko-dialer-status.h"
@@ -102,14 +103,18 @@
{
DBG_ENTER ();
DBG_LEAVE ();
-} gint timer_incoming_time_out (MokoDialerData * appdata)
+}
+
+gint
+timer_incoming_time_out (MokoDialerData * appdata)
{
//DBG_ENTER();
- TIMER_DATA * timer_data = &(appdata->g_timer_data);
+ //TIMER_DATA * timer_data = &(appdata->g_timer_data);
moko_dialer_status_update_icon (appdata->status_incoming);
-//now that we have the incoming call status report correctly, the timeout mechanism is not needed.
+ //now that we have the incoming call status report correctly, the timeout
+ //mechanism is not needed.
/*
if (event_get_keep_calling ())
{
@@ -117,7 +122,7 @@
timer_data->ticks = 0;
}
else
- { //we count 4 before we confirm that there are no calling at all.
+ { //we count 4 before we confirm that there are no calling at all.
if (timer_data->ticks >= 3)
{
DBG_MESSAGE ("THE CALLER aborted, we quit.");
@@ -186,9 +191,9 @@
memset (&(appdata->g_timer_data), 0, sizeof (appdata->g_timer_data));
appdata->g_timer_data.stopsec = 0;
appdata->g_timer_data.ptimer =
- g_timeout_add (1000, (GSourceFunc) timer_incoming_time_out,
- (gpointer) appdata);
+ g_timeout_add (1000, (GSourceFunc)timer_incoming_time_out, (gpointer)appdata);
}
+
void
on_window_incoming_show (GtkWidget * widget, MokoDialerData * appdata)
{
@@ -243,5 +248,6 @@
void
window_incoming_update_message (MokoDialerData *data, const gchar *clip)
{
- moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (data->window_incoming), "Incoming call from %s", clip);
+ moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (data->window_incoming),
+ "Incoming call from %s", clip);
}
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-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-outgoing.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -40,7 +40,7 @@
else
gtk_widget_show (data->buttonSpeaker);
- gtk_widget_hide (button);
+ gtk_widget_hide (GTK_WIDGET (button));
// do something else here too
}
@@ -49,7 +49,7 @@
{
gchar *number = g_object_get_data (G_OBJECT (button), "current-number");
- gtk_widget_hide (button);
+ gtk_widget_hide (GTK_WIDGET (button));
gtk_widget_show (data->buttonCancel);
@@ -57,6 +57,7 @@
moko_gsmd_connection_voice_dial (data->connection, number);
}
+#if 0 /* Not used at the moment */
static void
cb_cancel_button_clicked (GtkButton * button, MokoDialerData * appdata)
{
@@ -69,6 +70,7 @@
gtk_widget_hide (appdata->window_outgoing);
DBG_LEAVE ();
}
+#endif
gint
timer_outgoing_time_out (MokoDialerData * appdata)
@@ -177,73 +179,74 @@
gint
window_outgoing_init (MokoDialerData * p_dialer_data)
{
- MokoFingerWindow *window;
+ GtkWidget *window;
GtkWidget *vbox;
GtkWidget *status;
+ GtkWidget *button;
- if (p_dialer_data->window_outgoing == 0)
- {
+ if (p_dialer_data->window_outgoing != 0)
+ return 1;
+
+ vbox = gtk_vbox_new (FALSE, 0);
+ status = moko_dialer_status_new ();
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "outgoing_0.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "outgoing_1.png");
+ moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
+ "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);
- vbox = gtk_vbox_new (FALSE, 0);
- status = moko_dialer_status_new ();
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
- "outgoing_0.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
- "outgoing_1.png");
- moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
- "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);
+ gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
+ /* Set up window */
+ window = moko_message_dialog_new ();
+ 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");
- /* Set up window */
- window = moko_message_dialog_new ();
- 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");
+ /* Set up buttons */
+ button = gtk_button_new_from_stock (MOKO_STOCK_SPEAKER);
+ 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);
- /* Set up buttons */
- GtkWidget *button = gtk_button_new_from_stock (MOKO_STOCK_SPEAKER);
- 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_CALL_REDIAL);
+ p_dialer_data->buttonRedial = button;
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (cb_redial_button_clicked), p_dialer_data);
- 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);
+ p_dialer_data->buttonCancel = gtk_dialog_add_button (GTK_DIALOG (window),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL);
+ moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
+ "Outgoing call");
+ moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status),
+ "Calling ... (00:00:00)");
- 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);
+ p_dialer_data->window_outgoing = GTK_WIDGET (window);
+ p_dialer_data->status_outgoing = MOKO_DIALER_STATUS (status);
- p_dialer_data->buttonCancel = gtk_dialog_add_button (GTK_DIALOG (window), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ g_signal_connect (G_OBJECT (window), "show",
+ G_CALLBACK (on_window_outgoing_show), p_dialer_data);
+ g_signal_connect (G_OBJECT (window), "hide",
+ G_CALLBACK (on_window_outgoing_hide), p_dialer_data);
-
- moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
- "Outgoing call");
- moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status),
- "Calling ... (00:00:00)");
-
- p_dialer_data->window_outgoing = GTK_WIDGET (window);
- p_dialer_data->status_outgoing = MOKO_DIALER_STATUS (status);
-
- g_signal_connect ((gpointer) window, "show",
- G_CALLBACK (on_window_outgoing_show), p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_outgoing_hide), p_dialer_data);
-
- }
-
return 1;
}
@@ -258,18 +261,19 @@
if (type == MOKO_GSMD_PROG_CONNECTED)
{
- gtk_dialog_response (data->window_outgoing, GTK_RESPONSE_OK);
+ gtk_dialog_response (GTK_DIALOG (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_signal_connect (data->connection, "call-progress",
+ G_CALLBACK (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)
+ if (gtk_dialog_run (GTK_DIALOG (data->window_outgoing)) == GTK_RESPONSE_OK)
{
/* call has connected, so open the talking window */
/* window_talking_show (); */
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c 2007-05-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -27,7 +27,9 @@
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkvbox.h>
#include "dialer-main.h"
+#include "common.h"
+
void
pin_delete_button_clicked (GtkButton * button, MokoDialerData * appdata)
{
@@ -71,13 +73,14 @@
void
on_pin_panel_user_input (GtkWidget * widget, gchar parac, gpointer user_data)
{
+ MokoDialerData *appdata = (MokoDialerData *) user_data;
+ MokoDialerTextview *moko_pin_text_view = appdata->moko_pin_text_view;
char input[2];
+
input[0] = parac;
input[1] = 0;
-//DBG_TRACE();
- MokoDialerData *appdata = (MokoDialerData *) user_data;
- MokoDialerTextview *moko_pin_text_view = appdata->moko_pin_text_view;
+ //DBG_TRACE();
if (appdata->int_sim_pin_end_point < MOKO_DIALER_MAX_NUMBER_LEN)
{
appdata->str_sim_pin[appdata->int_sim_pin_end_point] = parac;
@@ -89,7 +92,7 @@
appdata->str_sim_pin[0] = parac;
appdata->int_sim_pin_end_point = 1;
}
-//DBG_TRACE();
+ //DBG_TRACE();
}
@@ -115,106 +118,85 @@
gint
window_pin_init (MokoDialerData * p_dialer_data)
{
+ MokoFingerWindow *window;
+ GdkColor color;
+ GtkWidget *vbox, *hbox, *eventbox1, *vbox2, *button1, *button2;
+ GtkWidget *mokotextview, *mokodialerpanel;
+
+ if (p_dialer_data->window_pin)
+ return 1;
+
+ g_stpcpy (p_dialer_data->str_sim_pin, "");
+ p_dialer_data->int_sim_pin_end_point = 0;
+
+ gdk_color_parse ("black", &color);
- if (!p_dialer_data->window_pin)
- {
-
- g_stpcpy (p_dialer_data->str_sim_pin, "");
- p_dialer_data->int_sim_pin_end_point = 0;
- GdkColor color;
- gdk_color_parse ("black", &color);
-
- GtkVBox *vbox = NULL;
-
-
- MokoFingerWindow *window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
- g_signal_connect ((gpointer) window, "show",
+ window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
+ g_signal_connect ((gpointer) window, "show",
G_CALLBACK (on_window_pin_show), p_dialer_data);
- g_signal_connect ((gpointer) window, "hide",
- G_CALLBACK (on_window_pin_hide), p_dialer_data);
+ g_signal_connect ((gpointer) window, "hide",
+ G_CALLBACK (on_window_pin_hide), p_dialer_data);
+
+ /* contents */
+ vbox = gtk_vbox_new (FALSE, 0);
+ hbox = gtk_hbox_new (FALSE, 10);
+ eventbox1 = gtk_event_box_new ();
+ gtk_widget_show (eventbox1);
+ gtk_widget_set_name (eventbox1, "gtkeventbox-black");
+ gtk_widget_modify_bg (eventbox1, GTK_STATE_NORMAL, &color);
+ // gtk_widget_set_size_request (eventbox1, 480, 132);
- /* contents */
- vbox = gtk_vbox_new (FALSE, 0);
- GtkHBox *hbox = gtk_hbox_new (FALSE, 10);
+ mokotextview = moko_dialer_textview_new ();
+ p_dialer_data->moko_pin_text_view = MOKO_DIALER_TEXTVIEW (mokotextview);
+ // moko_dialer_textview_fill_it(mokotextview , "Please input the pin:");
+ gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE, FALSE, 0);
- GtkEventBox *eventbox1 = gtk_event_box_new ();
- gtk_widget_show (eventbox1);
- gtk_widget_set_name (GTK_WIDGET (eventbox1), "gtkeventbox-black");
- gtk_widget_modify_bg (eventbox1, GTK_STATE_NORMAL, &color);
-// gtk_widget_set_size_request (eventbox1, 480, 132);
+ mokodialerpanel = moko_dialer_panel_new ();
+ gtk_widget_set_size_request (mokodialerpanel, 380, 384);
+ g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
+ G_CALLBACK (on_pin_panel_user_input), p_dialer_data);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (mokodialerpanel), TRUE,
+ TRUE, 5);
- MokoDialerTextview *mokotextview = moko_dialer_textview_new ();
- p_dialer_data->moko_pin_text_view = mokotextview;
-// moko_dialer_textview_fill_it(mokotextview , "Please input the pin:");
+ /* The buttons */
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ button1 = moko_pixmap_button_new ();
+ g_signal_connect (G_OBJECT (button1), "clicked",
+ G_CALLBACK (pin_delete_button_clicked), p_dialer_data);
+ gtk_widget_set_name (GTK_WIDGET (button1), "mokofingerbutton-orange");
- gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE,
- FALSE, 0);
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button1),
+ file_new_image_from_relative_path ("delete.png"));
- MokoDialerPanel *mokodialerpanel = moko_dialer_panel_new ();
+ moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button1),
+ "Delete");
+ // gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
+ // WINDOW_DIALER_BUTTON_SIZE_Y);
- gtk_widget_set_size_request (mokodialerpanel, 380, 384);
+ gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button1), FALSE, FALSE, 5);
+ button2 = moko_pixmap_button_new ();
+ gtk_widget_set_name (GTK_WIDGET (button2), "mokofingerbutton-orange");
+ moko_pixmap_button_set_finger_toolbox_btn_center_image
+ (MOKO_PIXMAP_BUTTON (button2),
+ file_new_image_from_relative_path ("phone.png"));
+ moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button2),
+ "OK");
+ g_signal_connect (G_OBJECT (button2), "clicked",
+ G_CALLBACK (pin_ok_button_clicked), p_dialer_data);
+ //gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X,
+ // WINDOW_DIALER_BUTTON_SIZE_Y);
+ gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button2), FALSE, FALSE, 20);
- g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
- G_CALLBACK (on_pin_panel_user_input), p_dialer_data);
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (vbox2), TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 5);
+
+ moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
+ p_dialer_data->window_pin = GTK_WIDGET (window);
- gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (mokodialerpanel), TRUE,
- TRUE, 5);
-
-
-
-//the buttons
-
- GtkVBox *vbox2 = gtk_vbox_new (FALSE, 0);
- GtkButton *button1 = moko_pixmap_button_new ();
- g_signal_connect (G_OBJECT (button1), "clicked",
- G_CALLBACK (pin_delete_button_clicked), p_dialer_data);
- gtk_widget_set_name (GTK_WIDGET (button1), "mokofingerbutton-orange");
-
- moko_pixmap_button_set_finger_toolbox_btn_center_image
- (MOKO_PIXMAP_BUTTON (button1),
- file_new_image_from_relative_path ("delete.png"));
-
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
- (button1), "Delete");
-// gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
- // WINDOW_DIALER_BUTTON_SIZE_Y);
-
- gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button1), FALSE, FALSE,
- 5);
-
- GtkButton *button2 = moko_pixmap_button_new ();
-
- g_signal_connect (G_OBJECT (button2), "clicked",
- G_CALLBACK (pin_ok_button_clicked), p_dialer_data);
- gtk_widget_set_name (GTK_WIDGET (button1), "mokofingerbutton-orange");
- moko_pixmap_button_set_finger_toolbox_btn_center_image
- (MOKO_PIXMAP_BUTTON (button2),
- file_new_image_from_relative_path ("phone.png"));
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
- (button2), "OK");
- //gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X,
- // WINDOW_DIALER_BUTTON_SIZE_Y);
-
- gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (button2), FALSE, FALSE,
- 20);
-
- gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (vbox2), TRUE, TRUE, 5);
-
-
-
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (hbox), TRUE, TRUE, 5);
-
-
- moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
-
-
- p_dialer_data->window_pin = window;
-
- }
-
return 1;
}
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c 2007-05-22 11:09:29 UTC (rev 2057)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-autolist.c 2007-05-22 11:15:33 UTC (rev 2058)
@@ -19,6 +19,9 @@
#include "moko-dialer-autolist.h"
#include "error.h"
#include "common.h"
+
+#include <string.h>
+
G_DEFINE_TYPE (MokoDialerAutolist, moko_dialer_autolist, GTK_TYPE_HBOX)
enum
{
More information about the commitlog
mailing list
