r908 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
tony_guan at sita.openmoko.org
tony_guan at sita.openmoko.org
Thu Feb 8 10:35:56 CET 2007
Author: tony_guan
Date: 2007-02-08 10:35:49 +0100 (Thu, 08 Feb 2007)
New Revision: 908
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h
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.h
trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c
Log:
attempting to resolve bug54, not finished.
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2007-02-08 08:31:09 UTC (rev 907)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2007-02-08 09:35:49 UTC (rev 908)
@@ -11,7 +11,6 @@
moko-dialer-tip.c\
moko-dialer-autolist.c\
event.c\
-pin.c\
history.c\
contacts.c\
common.c\
@@ -21,6 +20,7 @@
openmoko-dialer-window-outgoing.c\
openmoko-dialer-window-incoming.c\
openmoko-dialer-window-talking.c\
+openmoko-dialer-window-pin.c\
moko-dialer-status.c\
alsa.c
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-02-08 08:31:09 UTC (rev 907)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.c 2007-02-08 09:35:49 UTC (rev 908)
@@ -146,7 +146,7 @@
fprintf (stderr, "Can't connect to gsmd\n");
return -1;
}
- pin_init (lgsmh, pin);
+ gsm_pin_init (lgsmh);
event_init (lgsmh);
lgsm_register_handler (lgsmh, GSMD_MSG_PASSTHROUGH, &pt_msghandler);
lgsm_netreg_register (lgsmh, 0);
@@ -258,7 +258,7 @@
void
gsm_watcher_install (GMainLoop * mainloop)
{
- DBG_ENTER ();
+
static GSourceFuncs gsm_watcher_funcs = {
gsm_watcher_prepare,
gsm_watcher_check,
@@ -276,7 +276,7 @@
// DBG_MESSAGE ("ATACH");
g_source_attach (gsm_watcher, NULL);
// DBG_MESSAGE ("ATACH OUT");
- DBG_LEAVE ();
+
return;
}
@@ -287,3 +287,26 @@
DBG_MESSAGE ("lgsm_voice_dtmf");
lgsm_voice_dtmf (lgsmh, dtmf);
}
+#define PIN_SIZE 32
+
+static int
+gsm_pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
+{
+
+ int rc;
+
+ printf ("EVENT: PIN request (type=%u) ", aux->u.pin.type);
+
+ /* FIXME: read pin from STDIN and send it back via lgsm_pin */
+
+ gsm_pin_require();
+
+
+ return 0;
+}
+
+int
+gsm_pin_init (struct lgsm_handle *lh)
+{
+ return lgsm_evt_handler_register (lh, GSMD_EVT_PIN, &gsm_pin_handler);
+}
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h 2007-02-08 08:31:09 UTC (rev 907)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialergsm.h 2007-02-08 09:35:49 UTC (rev 908)
@@ -35,7 +35,7 @@
#include <libgsmd/libgsmd.h>
#include <libgsmd/voicecall.h>
#include <libgsmd/misc.h>
-#include "pin.h"
+//#include "pin.h"
#include "event.h"
#include <glib/gmain.h>
#include <glib/giochannel.h>
@@ -99,6 +99,8 @@
* @retval
*/
+ void gsm_pin_require();
+
void *gsm_monitor_thread (struct lgsm_handle *lgsmh);
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-02-08 08:31:09 UTC (rev 907)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-02-08 09:35:49 UTC (rev 908)
@@ -46,7 +46,21 @@
{
return p_dialer_data;
}
+void gsm_pin_require()
+{
+MOKO_DIALER_APP_DATA* appdata=moko_get_app_data();
+if(appdata)
+{
+gtk_widget_show(appdata->window_pin);
+}
+else
+{
+DBG_ERROR("gui failed to initialize.try another time.");
+}
+
+
+}
void gsm_incoming_call(gchar * number)
{
@@ -266,6 +280,7 @@
//init the dialer window
window_dialer_init(p_dialer_data);
window_incoming_init(p_dialer_data);
+ window_pin_init(p_dialer_data);
DBG_WARN("\nusage: \"openmoko-dialer\" will not show any GUI initialy until you reactivate the app using another \"openmoko-dialer\" command");
// window_outgoing_init(p_dialer_data);
// window_history_init(p_dialer_data);
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-02-08 08:31:09 UTC (rev 907)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-02-08 09:35:49 UTC (rev 908)
@@ -39,8 +39,8 @@
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;
-
MokoDialerAutolist *moko_dialer_autolist;
DIALER_CONTACTS_LIST_HEAD g_contactlist; ///< the whole list of the contacts from the contact book.
@@ -63,6 +63,7 @@
GtkWidget *window_talking;
GtkWidget *window_history;
GtkWidget *window_dialer;
+ GtkWidget *window_pin;
GtkWidget *window_present;
//buttons
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c 2007-02-08 08:31:09 UTC (rev 907)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/pin.c 2007-02-08 09:35:49 UTC (rev 908)
@@ -4,14 +4,14 @@
#include <libgsmd/libgsmd.h>
#include <libgsmd/event.h>
+static int
+pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
+{
#define PIN_SIZE 32
static char *pin;
static char pinbuf[PIN_SIZE + 1];
-static int
-pin_handler (struct lgsm_handle *lh, int evt, struct gsmd_evt_auxdata *aux)
-{
int rc;
printf ("EVENT: PIN request (type=%u) ", aux->u.pin.type);
@@ -24,13 +24,7 @@
}
else
{
- do
- {
- printf ("Please enter PIN: ");
- rc = fscanf (stdin, "%32s", &pinbuf);
- }
- while (rc < 1);
-
+ gsm_pin_require(pinbuf);
return lgsm_pin (lh, pinbuf);
}
More information about the commitlog
mailing list