r2758 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src

njp at sita.openmoko.org njp at sita.openmoko.org
Tue Aug 21 17:14:34 CEST 2007


Author: njp
Date: 2007-08-21 17:14:32 +0200 (Tue, 21 Aug 2007)
New Revision: 2758

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.h
Log:
2007-08-21  Neil J. Patel  <njp at o-hand.com>

	* src/dialer-main.c: (_dial_number), (main):
	* src/moko-dialer.c: (moko_dialer_dial):
	* src/moko-dialer.h:
	Fix bugs #649 (commandline option to dial)
	#456 (popup when pin requested).

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-21 13:26:55 UTC (rev 2757)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-21 15:14:32 UTC (rev 2758)
@@ -1,5 +1,13 @@
 2007-08-21  Neil J. Patel  <njp at o-hand.com>
 
+	* src/dialer-main.c: (_dial_number), (main):
+	* src/moko-dialer.c: (moko_dialer_dial):
+	* src/moko-dialer.h:
+	Fix bugs #649 (commandline option to dial)
+	#456 (popup when pin requested).
+
+2007-08-21  Neil J. Patel  <njp at o-hand.com>
+
 	* src/moko-talking.c: (moko_talking_init):
 	Fixed bug #730 (panel menu and 'hang up' are too close).
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c	2007-08-21 13:26:55 UTC (rev 2757)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c	2007-08-21 15:14:32 UTC (rev 2758)
@@ -27,6 +27,24 @@
 #define DIALER_NAMESPACE "org.openmoko.Dialer"
 #define DIALER_OBJECT "/org/openmoko/Dialer"
 
+static gboolean show_dialer;
+static gboolean show_missed;
+static gchar *number = NULL;
+
+static GOptionEntry entries[] = {
+  {"show-dialer", 's', 0, G_OPTION_ARG_NONE, &show_dialer,
+   "Show the dialer at startup", "N"},
+
+  {"show-missed", 'm', 0, G_OPTION_ARG_NONE, &show_missed,
+   "Show the history window filtered by the missed, none.", "N"},
+  
+  {"dial", 'd', 0, G_OPTION_ARG_STRING, &number,
+   "Dial the specified number.", "N"},
+
+  {NULL}
+};
+
+
 static void
 _show_dialer (DBusGConnection *conn)
 {
@@ -69,19 +87,27 @@
 
 }
 
-static gboolean show_dialer;
-static gboolean show_missed;
+static void
+_dial_number (DBusGConnection *conn)
+{
+  DBusGProxy *proxy = NULL;
+  GError *error = NULL;
 
-static GOptionEntry entries[] = {
-  {"show-dialer", 's', 0, G_OPTION_ARG_NONE, &show_dialer,
-   "Show the dialer at startup", "N"},
+  proxy = dbus_g_proxy_new_for_name (conn,
+                                      DIALER_NAMESPACE,
+                                      DIALER_OBJECT,
+                                      DIALER_NAMESPACE);
 
-  {"show-missed", 'm', 0, G_OPTION_ARG_NONE, &show_missed,
-   "Show the history window filtered by the missed, none.", "N"},
+  if (!proxy)
+    return;
+  
+  dbus_g_proxy_call (proxy, "Dial", &error,
+                     G_TYPE_STRING, number,
+                     G_TYPE_INVALID, G_TYPE_INVALID);
+  if (error)
+    g_warning (error->message);
 
-  {NULL}
-};
-
+}
 int
 main (int argc, char **argv)
 {
@@ -143,6 +169,8 @@
 
     if (show_missed)
       _show_missed (connection);
+    else if (number)
+      _dial_number (connection);
     else
       _show_dialer (connection);
     
@@ -178,10 +206,12 @@
   /* application object */
   g_set_application_name ("OpenMoko Dialer");
  
-  if (show_dialer)
-    moko_dialer_show_dialer (dialer, NULL);
+  if (number)
+    moko_dialer_dial (dialer, number, NULL);
   else if (show_missed)
     moko_dialer_show_missed_calls (dialer, NULL);
+  else if (show_dialer)
+    moko_dialer_show_dialer (dialer, NULL);
 
   gtk_main ();
   

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-21 13:26:55 UTC (rev 2757)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-21 15:14:32 UTC (rev 2758)
@@ -138,7 +138,7 @@
   return TRUE;
 }
 
-static gboolean
+gboolean
 moko_dialer_dial (MokoDialer *dialer, const gchar *number, GError *error)
 {
   MokoDialerPrivate *priv;
@@ -148,6 +148,7 @@
   g_return_val_if_fail (moko_dialer_show_dialer (dialer, NULL), FALSE);
   priv = dialer->priv;
 
+  moko_dialer_show_dialer (dialer, NULL);
   on_keypad_dial_clicked (NULL, number, dialer);
   return TRUE;
 }
@@ -432,9 +433,6 @@
       break;
     case MOKO_GSMD_CONNECTION_NETREG_DENIED:
       /* This may be a pin issue*/
-      g_print ("NetReg: Registration denied, the SIM pin may be needed\n");
-      moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), TRUE);
-      g_source_remove (priv->reg_timeout);
       break;
     case MOKO_GSMD_CONNECTION_NETREG_HOME:
     case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
@@ -540,6 +538,7 @@
   
   g_source_remove (priv->reg_timeout);
   moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), TRUE);
+  moko_dialer_show_dialer (dialer, NULL);
   g_print ("Pin Requested\n");
 
 }

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.h	2007-08-21 13:26:55 UTC (rev 2757)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.h	2007-08-21 15:14:32 UTC (rev 2758)
@@ -102,6 +102,9 @@
 gboolean
 moko_dialer_show_missed_calls (MokoDialer *dialer, GError *error);
 
+gboolean
+moko_dialer_dial (MokoDialer *dialer, const gchar *number, GError *error);
+
 void
 moko_dialer_outgoing_call (MokoDialer *dialer, const gchar *number);
 
@@ -114,7 +117,6 @@
 void
 moko_dialer_rejected (MokoDialer *dialer);
 
-
 G_END_DECLS
 
 #endif /* _HAVE_MOKO_DIALER_H */





More information about the commitlog mailing list