r2002 - in trunk/src/target/OM-2007/applications/openmoko-dialer: . src
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Thu May 17 20:47:07 CEST 2007
Author: mickey
Date: 2007-05-17 20:47:06 +0200 (Thu, 17 May 2007)
New Revision: 2002
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
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
Log:
openmoko-dialer: prepare to show PIN dialog on demand
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro 2007-05-17 18:46:37 UTC (rev 2001)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/openmoko-dialer.pro 2007-05-17 18:47:06 UTC (rev 2002)
@@ -1,11 +1,21 @@
-HEADERS += \
+TEMPLATE = app
+DEPENDPATH += src
+INCLUDEPATH += . src
+
+# Input
+HEADERS += config.h \
src/alsa.h \
src/common.h \
src/contacts.h \
- src/dialergsm.h \
+ src/dialer-callbacks-connection.h \
+ src/dialer-main.h \
+ src/dialer-window-dialer.h \
+ src/dialer-window-history.h \
+ src/dialer-window-incoming.h \
+ src/dialer-window-outgoing.h \
+ src/dialer-window-pin.h \
+ src/dialer-window-talking.h \
src/error.h \
- src/event.h \
- src/history.h \
src/moko-dialer-autolist.h \
src/moko-dialer-declares.h \
src/moko-dialer-includes.h \
@@ -13,38 +23,27 @@
src/moko-dialer-status.h \
src/moko-dialer-textview.h \
src/moko-dialer-tip.h \
- src/moko-digit-button.h \
- src/openmoko-dialer-main.h \
- src/openmoko-dialer-window-dialer.h \
- src/openmoko-dialer-window-history.h \
- src/openmoko-dialer-window-incoming.h \
- src/openmoko-dialer-window-outgoing.h \
- src/openmoko-dialer-window-pin.h \
- src/openmoko-dialer-window-talking.h
+ src/moko-digit-button.h
-SOURCES += \
- src/alsa.c \
+SOURCES += src/alsa.c \
src/common.c \
src/contacts.c \
- src/dialergsm.c \
- src/event.c \
- src/history.c \
+ src/dialer-callbacks-connection.c \
+ src/dialer-main.c \
+ src/dialer-window-dialer.c \
+ src/dialer-window-history.c \
+ src/dialer-window-incoming.c \
+ src/dialer-window-outgoing.c \
+ src/dialer-window-pin.c \
+ src/dialer-window-talking.c \
src/moko-dialer-autolist.c \
src/moko-dialer-panel.c \
src/moko-dialer-status.c \
src/moko-dialer-textview.c \
src/moko-dialer-tip.c \
- src/moko-digit-button.c \
- src/openmoko-dialer-main.c \
- src/openmoko-dialer-window-dialer.c \
- src/openmoko-dialer-window-history.c \
- src/openmoko-dialer-window-incoming.c \
- src/openmoko-dialer-window-outgoing.c \
- src/openmoko-dialer-window-pin.c \
- src/openmoko-dialer-window-talking.c
+ src/moko-digit-button.c
-MOKOCONFIG = mokoui
-PKGCONFIG += libebook-1.2 libgsmd alsa
+MOKOCONFIG = mokoui mokogsmd mokojournal
+PKGCONFIG += libebook-1.2 alsa
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
-
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-17 18:46:37 UTC (rev 2001)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c 2007-05-17 18:47:06 UTC (rev 2002)
@@ -1,3 +1,21 @@
+/* openmoko-callbacks-connection.h
+ *
+ * Authored By Tony Guan <tonyguan at fic-sh.com.cn>
+ * Thomas Wood <thomas at o-hand.com>
+ * Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ *
+ * Copyright (C) 2006-2007 OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2.1 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ *
+ */
#include "dialer-callbacks-connection.h"
#include "dialer-window-incoming.h"
@@ -22,3 +40,16 @@
/* caller id */
window_incoming_update_message (data, number);
}
+
+void
+incoming_pin_request_cb (MokoGsmdConnection *self, int type, MokoDialerData *data)
+{
+ g_debug( "INCOMING PIN REQUEST!\n!\n!\n!\n" );
+}
+
+gboolean initial_timeout_cb (MokoGsmdConnection *conn)
+{
+ g_debug( "INITIAL TIMEOUT" );
+ //moko_gsmd_connection_network_register( conn );
+ 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-17 18:46:37 UTC (rev 2001)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h 2007-05-17 18:47:06 UTC (rev 2002)
@@ -1,3 +1,21 @@
+/* openmoko-callbacks-connection.h
+ *
+ * Authored By Tony Guan <tonyguan at fic-sh.com.cn>
+ * Thomas Wood <thomas at o-hand.com>
+ * Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+ *
+ * Copyright (C) 2006-2007 OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2.1 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ *
+ */
#ifndef _DIALER_CALLBACKS_CONNECTION_H
#define _DIALER_CALLBACKS_CONNECTION_H
@@ -8,5 +26,8 @@
void network_registration_cb (MokoGsmdConnection *self, int type, int lac, int cell);
void incoming_call_cb (MokoGsmdConnection *self, int type, MokoDialerData *data);
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);
+
#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-17 18:46:37 UTC (rev 2001)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c 2007-05-17 18:47:06 UTC (rev 2002)
@@ -1,4 +1,4 @@
-/* openmoko-dialer.c
+/* openmoko-dialer.c
*
* Authored by Tony Guan<tonyguan at fic-sh.com.cn>
*
@@ -18,7 +18,6 @@
#include <libmokoui/moko-ui.h>
#include <libmokogsmd/moko-gsmd-connection.h>
-
#include <gtk/gtk.h>
#include <signal.h>
#include <unistd.h>
@@ -182,12 +181,16 @@
/* Set up gsmd connection object */
MokoGsmdConnection* conn = p_dialer_data->connection = moko_gsmd_connection_new ();
+
+ /* power on GSM */
moko_gsmd_connection_set_antenna_power (conn, TRUE);
- sleep (4); /* FIXME: this is horrible */
- moko_gsmd_connection_network_register (conn);
+ /* handle network registration 4 seconds after powering GSM */
+ g_timeout_add( 4 * 1000, (GSourceFunc) initial_timeout_cb, conn );
+
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);
g_signal_connect (G_OBJECT (conn), "incoming-clip", (GCallback) incoming_clip_cb, p_dialer_data);
+ g_signal_connect (G_OBJECT (conn), "pin-requested", (GCallback) incoming_pin_request_cb, p_dialer_data);
/* Set up journal handling */
p_dialer_data->journal = moko_journal_open_default ();
More information about the commitlog
mailing list
