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

thomas at sita.openmoko.org thomas at sita.openmoko.org
Tue May 15 18:14:08 CEST 2007


Author: thomas
Date: 2007-05-15 18:14:05 +0200 (Tue, 15 May 2007)
New Revision: 1960

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-dialer.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h
Log:
* openmoko-dialer/src/dialer-window-dialer.c:
* 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:
* openmoko-dialer/src/dialer-main.c:
* openmoko-dialer/src/dialer-main.h:
Open a message window on incoming call signal

* openmoko-dialer/src/dialer-window-history.c: Don't try to read the journal if it doesn't exist


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-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.c	2007-05-15 16:14:05 UTC (rev 1960)
@@ -1,4 +1,6 @@
+
 #include "dialer-callbacks-connection.h"
+#include "dialer-window-incoming.h"
 
 
 void
@@ -8,9 +10,10 @@
 }
 
 void
-incoming_call_cb (MokoGsmdConnection *self, int type)
+incoming_call_cb (MokoGsmdConnection *self, int type, MokoDialerData *data)
 {
   /* incoming call */
+  window_incoming_show (data);
 }
 
 void

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-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-callbacks-connection.h	2007-05-15 16:14:05 UTC (rev 1960)
@@ -1,6 +1,12 @@
 
+#ifndef _DIALER_CALLBACKS_CONNECTION_H
+#define _DIALER_CALLBACKS_CONNECTION_H
+
 #include <libmokogsmd/moko-gsmd-connection.h>
+#include <dialer-main.h>
 
 void network_registration_cb (MokoGsmdConnection *self, int type, int lac, int cell);
-void incoming_call_cb (MokoGsmdConnection *self, int type);
+void incoming_call_cb (MokoGsmdConnection *self, int type, MokoDialerData *data);
 void incoming_clip_cb (MokoGsmdConnection *self, const char *number);
+
+#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-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.c	2007-05-15 16:14:05 UTC (rev 1960)
@@ -15,11 +15,7 @@
  *
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */
-#include <libmokoui/moko-application.h>
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-
+#include <libmokoui/moko-ui.h>
 #include <libmokogsmd/moko-gsmd-connection.h>
 
 
@@ -185,9 +181,9 @@
 
   /* 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);
+  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);
 
   /* Set up journal handling */
   p_dialer_data->journal = moko_journal_open_default ();

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-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-main.h	2007-05-15 16:14:05 UTC (rev 1960)
@@ -15,6 +15,10 @@
  *
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */
+
+#ifndef _DIALER_MAIN_H_
+#define _DIALER_MAIN_H_
+
 #include "moko-dialer-includes.h"
 #include <libmokogsmd/moko-gsmd-connection.h>
 #include <libmokojournal/moko-journal.h>
@@ -90,3 +94,5 @@
 
   GdkPixbuf *g_iconReceived, *g_iconMissed, *g_iconDialed;      ///<the global pixbuf for the 3 icons displayed in the history window.}DIALER_APP_DATA;
 } MokoDialerData;
+
+#endif

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c	2007-05-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c	2007-05-15 16:14:05 UTC (rev 1960)
@@ -100,7 +100,12 @@
 {
   gchar *number;
   number = moko_dialer_textview_get_input (appdata->moko_dialer_text_view, TRUE);
-  g_debug ("Dialing: %s", number);
+  if (!number)
+  {
+    /* show the history window if no number entered */
+    gtk_widget_show_all (appdata->window_history);
+    return;
+  }
   window_outgoing_dial (appdata, number);
 }
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c	2007-05-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c	2007-05-15 16:14:05 UTC (rev 1960)
@@ -650,6 +650,10 @@
 
   j_entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
 
+  /* Bail out if we couldn't get the entry. Do we need to display a warning here? */
+  if (!j_entry)
+    return 0;
+
   while (moko_journal_get_entry_at (p_dialer_data->journal, i, &j_entry))
   {
     const gchar *uid, *number;

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c	2007-05-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c	2007-05-15 16:14:05 UTC (rev 1960)
@@ -16,20 +16,9 @@
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */  
   
-#include <libmokoui/moko-finger-tool-box.h>
-#include <libmokoui/moko-finger-window.h>
-#include <libmokoui/moko-finger-wheel.h>
-#include <libmokoui/moko-pixmap-button.h>
+#include <libmokoui/moko-ui.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/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
-  
+#include <gtk/gtk.h>
 #include "contacts.h"
 #include "dialer-main.h"
 #include "moko-dialer-status.h"
@@ -207,75 +196,27 @@
   appdata->g_state.callstate = STATE_INCOMING;
   window_incoming_setup_timer (appdata);
   DBG_LEAVE ();
-} gint  window_incoming_init (MokoDialerData * p_dialer_data) 
-{
-  DBG_ENTER ();
-  MokoFingerWindow * window;
-  GtkWidget * vbox;
-  GtkWidget * status;
-  if (p_dialer_data->window_incoming == 0)
-    
-  {
-    vbox = gtk_vbox_new (FALSE, 0);
-    status = moko_dialer_status_new ();
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
-                                         "incoming_0.png");
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
-                                         "incoming_1.png");
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
-                                         "incoming_2.png");
-    moko_dialer_status_add_status_icon (MOKO_DIALER_STATUS (status),
-                                         "incoming_3.png");
-    moko_dialer_status_set_icon_by_index (MOKO_DIALER_STATUS (status), 0);
-    gtk_box_pack_start (GTK_BOX (vbox), status, FALSE, FALSE, 0);
-    GtkWidget * hbox2 = gtk_hbox_new (FALSE, 0);
-    GtkWidget * button = gtk_button_new_with_label ("Answer");
-    gtk_button_set_image (GTK_BUTTON (button),
-                           file_new_image_from_relative_path ("answer.png"));
-    g_signal_connect (G_OBJECT (button), "clicked",
-                       G_CALLBACK (cb_answer_button_clicked), p_dialer_data);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
-                          10);
-    button = gtk_button_new_with_label ("Ignore");
-    g_signal_connect (G_OBJECT (button), "clicked",
-                       G_CALLBACK (cb_ignore_button_clicked), p_dialer_data);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
-                         10);
-    button = gtk_button_new_with_label ("Reject");
-    gtk_button_set_image (GTK_BUTTON (button),
-                           file_new_image_from_relative_path ("cancel.png"));
-    g_signal_connect (G_OBJECT (button), "clicked",
-                       G_CALLBACK (cb_reject_button_clicked), p_dialer_data);
-    gtk_box_pack_start (GTK_BOX (hbox2), GTK_WIDGET (button), TRUE, TRUE,
-                         10);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 50);
-    
-//currently     MokoDialogWindow is not finished, wating...
-//   MokoDialogWindow* window = (MokoDialogWindow *)(moko_dialog_window_new());
-//  moko_dialog_window_set_contents( window, GTK_WIDGET(vbox) );
-      window = MOKO_FINGER_WINDOW (moko_finger_window_new ());
-    moko_finger_window_set_contents (window, GTK_WIDGET (vbox));
-    
-      //FIXME: dear thomas, I know that show & hide is not good, but when you removed the following 2 lines, the incoming window
-      //is simply not displaying well. please have a try and then commit. If you cannot test the incoming window, you can simply modify the code to show it out debuggingly.
-      //Pardon me to re-add the 2 lines. Tony Guan 14,3,2007
-      gtk_widget_show_all (GTK_WIDGET (window));
-    gtk_widget_hide (GTK_WIDGET (window));
-    moko_dialer_status_set_title_label (MOKO_DIALER_STATUS (status),
-                                          "Incoming call");
-    moko_dialer_status_set_status_label (MOKO_DIALER_STATUS (status), "");
-    p_dialer_data->window_incoming = GTK_WIDGET (window);
-    p_dialer_data->status_incoming = MOKO_DIALER_STATUS (status);
-    
-//   DBG_MESSAGE("p_dialer_data->status_incoming=0X%x",p_dialer_data->status_incoming);
-      g_signal_connect ((gpointer) window, "show",
-                          G_CALLBACK (on_window_incoming_show),
-                          p_dialer_data);
-    g_signal_connect ((gpointer) window, "hide",
-                       G_CALLBACK (on_window_incoming_hide), p_dialer_data);
-  }
-  DBG_LEAVE ();
-  return 1;
 }
 
+void
+window_incoming_init (MokoDialerData * p_dialer_data) 
+{
+  GtkWidget * window;
 
+  if (p_dialer_data->window_incoming)
+     return;
+
+  window = moko_message_dialog_new ();
+
+  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");
+
+}
+
+void
+window_incoming_show (MokoDialerData *data)
+{
+  gtk_dialog_run (data->window_incoming);
+  gtk_widget_hide (data->window_incoming);
+}

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h	2007-05-15 14:47:19 UTC (rev 1959)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.h	2007-05-15 16:14:05 UTC (rev 1960)
@@ -15,26 +15,14 @@
  *
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */
-#include "moko-dialer-includes.h"
 
 #ifndef _OPENMOKO_DIALER_WINDOW_INCOMING_H
 #define _OPENMOKO_DIALER_WINDOW_INCOMING_H
 
-#ifdef __cplusplus
+#include "dialer-main.h"
 
+void window_incoming_init (MokoDialerData * p_dialer_data);
+void window_incoming_prepare (MokoDialerData * appdata);
+void window_incoming_show (MokoDialerData *data);
 
-
-extern "C"
-{
 #endif
-
-
-
-  gint window_incoming_init (MokoDialerData * p_dialer_data);
-
-  void window_incoming_prepare (MokoDialerData * appdata);
-#ifdef __cplusplus
-}
-#endif
-
-#endif





More information about the commitlog mailing list