Changeset 1966

Timestamp:

05/16/07 15:11:12 (6 years ago)

Author:

thomas

Message:

• openmoko-dialer/src/dialer-window-incoming.c:
• openmoko-dialer/src/dialer-callbacks-connection.c:
• openmoko-dialer/src/dialer-window-incoming.h:
• openmoko-dialer/src/dialer-callbacks-connection.h:

Implement incoming window responses and make use clip if available.

• openmoko-dialer/src/dialer-main.c: Move gtk initialisation to after single
• instance check. Add gsm power on and register functions.

Location:

trunk/src/target/OM-2007/applications/openmoko-dialer/src

Files:

• dialer-callbacks-connection.c (modified) (1 diff)
• dialer-callbacks-connection.h (modified) (1 diff)
• dialer-main.c (modified) (2 diffs)
• dialer-window-incoming.c (modified) (2 diffs)
• dialer-window-incoming.h (modified) (1 diff)

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c

@@ -18 +18 @@
 
 void
-incoming_clip_cb (MokoGsmdConnection *self, const char *number)
+incoming_clip_cb (MokoGsmdConnection *self, const char *number, MokoDialerData *data)
 {
   /* caller id */
+  window_incoming_update_message (data, number);
 }

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h

@@ -8 +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);
+void incoming_clip_cb (MokoGsmdConnection *self, const char *number, MokoDialerData *data);
 
 #endif

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c

@@ -145 +145 @@
   pid_t lockapp;
 
+
+  if (argc != 1)
+  {
+    /* Add init code. */
+    GError *error = NULL;
+    GOptionContext *context = g_option_context_new ("");
+
+    g_option_context_add_main_entries (context, entries, NULL);
+    g_option_context_add_group (context, gtk_get_option_group (TRUE));
+    g_option_context_parse (context, &argc, &argv, &error);
+
+    g_option_context_free (context);
+  }
+
+  //FIXME: the following lines to enable unique instance will be changed.
+  lockapp = testlock ("/tmp/dialer.lock");
+  if (lockapp > 0)
+  {
+    kill (lockapp, SIGUSR1);
+    return 0;
+  }
+  setlock ("/tmp/dialer.lock");
+
   /* Initialize GTK+ */
   gtk_init (&argc, &argv);
   moko_stock_register ();
 
-  if (argc != 1)
-  {
-    /* Add init code. */
-    GError *error = NULL;
-    GOptionContext *context = g_option_context_new ("");
-
-    g_option_context_add_main_entries (context, entries, NULL);
-    g_option_context_add_group (context, gtk_get_option_group (TRUE));
-    g_option_context_parse (context, &argc, &argv, &error);
-
-    g_option_context_free (context);
-  }
-  //FIXME: the following lines to enable unique instance will be changed.
-  lockapp = testlock ("/tmp/dialer.lock");
-  if (lockapp > 0)
-  {
-    kill (lockapp, SIGUSR1);
-    return 0;
-  }
-  setlock ("/tmp/dialer.lock");
-
-
   p_dialer_data = g_new0 (MokoDialerData, 1);
 
@@ -182 +183 @@
   /* Set up gsmd connection object */
   MokoGsmdConnection* conn = p_dialer_data->connection = moko_gsmd_connection_new ();
+  moko_gsmd_connection_set_antenna_power (conn, TRUE);
+  sleep (4); /* FIXME: this is horrible */
+  moko_gsmd_connection_network_register (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);

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c

@@ -210 +210 @@
 
   gtk_dialog_add_button (GTK_DIALOG (window), MOKO_STOCK_CALL_ANSWER, GTK_RESPONSE_OK);
-  gtk_dialog_add_button (GTK_DIALOG (window), MOKO_STOCK_CALL_REJECT, GTK_RESPONSE_OK);
-  moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (window), "Incoming Call");
+  gtk_dialog_add_button (GTK_DIALOG (window), MOKO_STOCK_CALL_REJECT, GTK_RESPONSE_CANCEL);
+  moko_message_dialog_set_message (MOKO_MESSAGE_DIALOG (window), "Incoming call");
 
 }
@@ -218 +218 @@
 window_incoming_show (MokoDialerData *data)
 {
-  gtk_dialog_run (data->window_incoming);
+  if (gtk_dialog_run (GTK_DIALOG (data->window_incoming)) == GTK_RESPONSE_OK)
+  {
+    moko_gsmd_connection_voice_accept (data->connection);
+    /* dialer_window_talking_show (data); */
+    gtk_widget_show_all (data->window_talking);
+  }
+  else
+  {
+    moko_gsmd_connection_voice_hangup (data->connection);
+  }
+
   gtk_widget_hide (data->window_incoming);
 }
+
+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);
+}

trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h

@@ -25 +25 @@
 void window_incoming_prepare (MokoDialerData * appdata);
 void window_incoming_show (MokoDialerData *data);
+void window_incoming_update_message (MokoDialerData *data, const gchar *clip);
+
 
 #endif