r1840 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Wed Apr 25 18:00:50 CEST 2007
Author: thomas
Date: 2007-04-25 18:00:49 +0200 (Wed, 25 Apr 2007)
New Revision: 1840
Added:
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
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
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/openmoko-dialer-window-pin.c
Log:
* Add callbacks skeleton for MokoGsmdConnection
* Remove final libgsmd code
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2007-04-25 15:42:26 UTC (rev 1839)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am 2007-04-25 16:00:49 UTC (rev 1840)
@@ -4,7 +4,9 @@
bin_PROGRAMS = openmoko-dialer
-openmoko_dialer_SOURCES = openmoko-dialer-main.c\
+openmoko_dialer_SOURCES = \
+dialer-callbacks-connection.c\
+openmoko-dialer-main.c\
moko-digit-button.c\
moko-dialer-panel.c\
moko-dialer-textview.c\
Added: 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-04-25 15:42:26 UTC (rev 1839)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c 2007-04-25 16:00:49 UTC (rev 1840)
@@ -0,0 +1,20 @@
+#include "dialer-callbacks-connection.h"
+
+
+void
+network_registration_cb (MokoGsmdConnection *self, int type, int lac, int cell)
+{
+ /* network registration */
+}
+
+void
+incoming_call_cb (MokoGsmdConnection *self, int type)
+{
+ /* incoming call */
+}
+
+void
+incoming_clip_cb (MokoGsmdConnection *self, const char *number)
+{
+ /* caller id */
+}
Added: 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-04-25 15:42:26 UTC (rev 1839)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h 2007-04-25 16:00:49 UTC (rev 1840)
@@ -0,0 +1,6 @@
+
+#include <libmokogsmd/moko-gsmd-connection.h>
+
+void network_registration_cb (MokoGsmdConnection *self, int type, int lac, int cell);
+void incoming_call_cb (MokoGsmdConnection *self, int type);
+void incoming_clip_cb (MokoGsmdConnection *self, const char *number);
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-04-25 15:42:26 UTC (rev 1839)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-04-25 16:00:49 UTC (rev 1840)
@@ -20,14 +20,10 @@
#include <libmokoui/moko-finger-window.h>
#include <libmokoui/moko-finger-wheel.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/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
+#include <libmokogsmd/moko-gsmd-connection.h>
+
+
+#include <gtk/gtk.h>
#include <signal.h>
#include <unistd.h>
#include <sys/stat.h>
@@ -45,6 +41,8 @@
#include "openmoko-dialer-window-pin.h"
#include "openmoko-dialer-window-history.h"
+#include "dialer-callbacks-connection.h"
+
MokoDialerData *p_dialer_data = 0;
MokoDialerData *
moko_get_app_data ()
@@ -52,135 +50,6 @@
return p_dialer_data;
}
-void
-gsm_pin_require (struct lgsm_handle *lh)
-{
- MokoDialerData *appdata = moko_get_app_data ();
-
- if (appdata)
- {
- appdata->lh = lh;
- gtk_widget_show (appdata->window_pin);
- }
- else
- {
- DBG_ERROR ("gui failed to initialize.try another time.");
- }
-
-
-}
-void
-gsm_incoming_call (gchar * number)
-{
-
- MokoDialerData *appdata = moko_get_app_data ();
-
- if (appdata)
- {
-//first, we should remove the "" from the number.
- char *temp = NULL;
- int start = 0;
- int end = strlen (number) - 1;
- while (number[start] == '\"' && start < end)
- start++;
- if (end > 0)
- while (number[end] == '\"' && start < end)
- end--;
-
- g_return_if_fail (start <= end);
-
- DBG_MESSAGE ("START=%d,END=%d", start, end);
- temp = g_strndup (number + start, end - start + 1);
-
- g_return_if_fail (temp != NULL);
-
- DBG_MESSAGE ("%s", temp);
-
-//got the number;
- g_stpcpy (appdata->g_peer_info.number, temp);
-
- g_free (temp);
-//retrieve the contact information if any.
- contact_get_peer_info_from_number (appdata->g_contactlist.contacts,
- &(appdata->g_peer_info));
-// contact_get_peer_info_from_number
-
-
-//transfer the contact info
- window_incoming_prepare (appdata);
-
- gtk_widget_show (appdata->window_incoming);
- }
- else
- {
- DBG_ERROR ("gui failed to initialize.try another time.");
- }
-
-
-}
-
-void
-gsm_peer_accept ()
-{
- MokoDialerData *appdata = moko_get_app_data ();
- DBG_ENTER ();
-//moko_dialer_status_update_icon(appdata->status_outgoing);
-
-
- appdata->g_state.callstate = STATE_TALKING;
-
- gtk_widget_hide (appdata->window_outgoing);
-
-
-//transfer the contact info
- window_talking_prepare (appdata);
-
-//start talking.
-
- gtk_widget_show (appdata->window_talking);
-
-
- DBG_LEAVE ();
-}
-
-void
-gsm_peer_refuse ()
-{
- MokoDialerData *appdata = moko_get_app_data ();
- window_outgoing_fails (appdata);
-}
-
-void
-gsm_peer_abort ()
-{
-
- MokoDialerData *appdata = moko_get_app_data ();
- if (appdata->window_incoming)
- gtk_widget_hide (appdata->window_incoming);
-
-
-}
-
-void
-gsm_peer_disconnect ()
-{
-
- MokoDialerData *appdata = moko_get_app_data ();
- /* TODO: MokoGsmdConnection->hangup
- * gsm_hangup ();
- */
-
- if (appdata->window_talking)
- gtk_widget_hide (appdata->window_talking);
- if (appdata->window_outgoing)
- gtk_widget_hide (appdata->window_outgoing);
- if (appdata->window_incoming)
- gtk_widget_hide (appdata->window_incoming);
-
-}
-
-
-
static void
handle_sigusr1 (int value)
{
@@ -305,7 +174,7 @@
setlock ("/tmp/dialer.lock");
- p_dialer_data = calloc (1, sizeof (MokoDialerData));
+ p_dialer_data = g_new0 (MokoDialerData, 1);
//init application data
contact_init_contact_data (&(p_dialer_data->g_contactlist));
@@ -316,6 +185,11 @@
// MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
g_set_application_name ("OpenMoko Dialer");
+ /* 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);
signal (SIGUSR1, handle_sigusr1);
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-04-25 15:42:26 UTC (rev 1839)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h 2007-04-25 16:00:49 UTC (rev 1840)
@@ -16,6 +16,7 @@
* Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
*/
#include "moko-dialer-includes.h"
+#include <libmokogsmd/moko-gsmd-connection.h>
/*
typedef struct _window_outgoing
@@ -33,7 +34,7 @@
typedef struct _dialer_data
{
//the global data area begins here
- struct lgsm_handle *lh;
+ MokoGsmdConnection *connection;
char str_sim_pin[MOKO_DIALER_MAX_PIN_LEN + 1];
gint int_sim_pin_end_point;
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c 2007-04-25 15:42:26 UTC (rev 1839)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c 2007-04-25 16:00:49 UTC (rev 1840)
@@ -57,7 +57,7 @@
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, appdata->str_sim_pin);
//lgsm_pin (appdata->lh, "1234");
DBG_MESSAGE ("pin:%s sent", appdata->str_sim_pin);
gtk_widget_hide (appdata->window_pin);
More information about the commitlog
mailing list
