r2069 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Wed May 23 15:25:55 CEST 2007
Author: mickey
Date: 2007-05-23 15:25:55 +0200 (Wed, 23 May 2007)
New Revision: 2069
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-pin.c
Log:
openmoko-dialer: PIN request done
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-23 12:44:30 UTC (rev 2068)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c 2007-05-23 13:25:55 UTC (rev 2069)
@@ -44,12 +44,22 @@
void
incoming_pin_request_cb (MokoGsmdConnection *self, int type, MokoDialerData *data)
{
- g_debug( "INCOMING PIN REQUEST!\n!\n!\n!\n" );
+ g_debug( "incoming pin request for type %d", type );
+ gtk_widget_show_all( data->window_pin );
}
-gboolean initial_timeout_cb (MokoGsmdConnection *conn)
+gboolean initial_timeout_cb (MokoDialerData* data)
{
- g_debug( "INITIAL TIMEOUT" );
- //moko_gsmd_connection_network_register( conn );
+ g_debug( "initial timeout" );
+ /* check whether PIN window is currently visible -- if not, issue register */
+ if ( GTK_WIDGET_MAPPED( data->window_pin ) )
+ {
+ g_debug( "pin window is visible, delaying call to register" );
+ }
+ else
+ {
+ g_debug( "pin window not visible, calling register" );
+ moko_gsmd_connection_network_register( data->connection );
+ }
return FALSE;
}
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-23 12:44:30 UTC (rev 2068)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h 2007-05-23 13:25:55 UTC (rev 2069)
@@ -28,6 +28,6 @@
void incoming_clip_cb (MokoGsmdConnection *self, const char *number, MokoDialerData *data);
void incoming_pin_request_cb (MokoGsmdConnection *self, int type, MokoDialerData *data);
-gboolean initial_timeout_cb (MokoGsmdConnection *conn);
+gboolean initial_timeout_cb (MokoDialerData *data);
#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-23 12:44:30 UTC (rev 2068)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c 2007-05-23 13:25:55 UTC (rev 2069)
@@ -180,7 +180,6 @@
//init application data
contact_init_contact_data (&(p_dialer_data->g_contactlist));
-
/* application object */
g_set_application_name ("OpenMoko Dialer");
@@ -189,8 +188,8 @@
/* power on GSM */
moko_gsmd_connection_set_antenna_power (conn, TRUE);
- /* handle network registration 4 seconds after powering GSM */
- g_timeout_add( 4 * 1000, (GSourceFunc) initial_timeout_cb, conn );
+ /* handle network registration some seconds after powering GSM */
+ g_timeout_add( 5 * 1000, (GSourceFunc) initial_timeout_cb, p_dialer_data );
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);
@@ -216,7 +215,6 @@
gtk_main ();
-
//release everything
contact_release_contact_list (&(p_dialer_data->g_contactlist));
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-23 12:44:30 UTC (rev 2068)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h 2007-05-23 13:25:55 UTC (rev 2069)
@@ -34,7 +34,7 @@
char str_sim_pin[MOKO_DIALER_MAX_PIN_LEN + 1];
gint int_sim_pin_end_point;
- MokoDialerTextview *moko_dialer_text_view; ///<the textview for the dialer window
+ MokoDialerTextview *moko_dialer_text_view; ///<the textview for the dialer window
MokoDialerTextview *moko_dtmf_text_view; ///<the textview for the dtmf window
MokoDialerTextview *moko_pin_text_view;
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-23 12:44:30 UTC (rev 2068)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-pin.c 2007-05-23 13:25:55 UTC (rev 2069)
@@ -28,6 +28,7 @@
#include <gtk/gtkvbox.h>
#include "dialer-main.h"
#include "common.h"
+#include "dialer-callbacks-connection.h"
void
@@ -58,13 +59,11 @@
{ //here send the pin codes and hide our window.
DBG_MESSAGE ("here we send the pin:%s", appdata->str_sim_pin);
- //FIXME:why this call will cause segment fault?
- //lgsm_pin (appdata->lh, appdata->str_sim_pin);
- //lgsm_pin (appdata->lh, "1234");
+ moko_gsmd_connection_send_pin( appdata->connection, appdata->str_sim_pin );
DBG_MESSAGE ("pin:%s sent", appdata->str_sim_pin);
+ g_timeout_add( 1 * 1000, (GSourceFunc) initial_timeout_cb, appdata );
gtk_widget_hide (appdata->window_pin);
}
-
}
@@ -76,7 +75,7 @@
MokoDialerData *appdata = (MokoDialerData *) user_data;
MokoDialerTextview *moko_pin_text_view = appdata->moko_pin_text_view;
char input[2];
-
+
input[0] = parac;
input[1] = 0;
@@ -122,13 +121,13 @@
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);
window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
@@ -136,7 +135,7 @@
G_CALLBACK (on_window_pin_show), 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);
@@ -149,13 +148,14 @@
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:");
+ moko_dialer_textview_fill_it(mokotextview , " PIN?");
+
gtk_container_add (GTK_CONTAINER (eventbox1), mokotextview);
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (eventbox1), FALSE, FALSE, 0);
mokodialerpanel = moko_dialer_panel_new ();
- gtk_widget_set_size_request (mokodialerpanel, 380, 384);
+ gtk_widget_set_size_request (mokodialerpanel, 380, 384); //??? why hard coded
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,
@@ -170,10 +170,10 @@
moko_pixmap_button_set_finger_toolbox_btn_center_image
(MOKO_PIXMAP_BUTTON (button1),
- file_new_image_from_relative_path ("delete.png"));
+ file_new_image_from_relative_path ("delete.png"));
- moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button1),
- "Delete");
+ moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON (button1),
+ "Del");
// gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
// WINDOW_DIALER_BUTTON_SIZE_Y);
@@ -184,8 +184,8 @@
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");
+ 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,
@@ -194,7 +194,7 @@
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);
More information about the commitlog
mailing list