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

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-09-09 14:55:48 +0200 (Sun, 09 Sep 2007)
New Revision: 2945

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
openmoko-dialer2: fix typo and prevent dialing when netreg has been denied
patch by cesarb, thanks rwhitby.


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-09-08 16:27:56 UTC (rev 2944)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-09-09 12:55:48 UTC (rev 2945)
@@ -1,3 +1,8 @@
+2007-09-09	Michael Lauer <mickey at openmoko.org>
+
+	* src/moko-dialer.c: Fix typo and prevent dialing when
+	registration has been denied by the network.
+
 2007-09-07  Thomas Wood  <thomas at openedhand.com>
 
 	* src/moko-contacts.c: (moko_contacts_add_contact): Use fullname for
@@ -5,7 +10,7 @@
 
 2007-09-07  Thomas Wood  <thomas at openedhand.com>
 
-	* src/moko-dialer.c: (moko_dialer_init):#
+	* src/moko-dialer.c: (moko_dialer_init):
 	 - Prevent critical warnings if the journal cannot be loaded.
 	 - Exit if we cannot connect to gsmd
 

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-09-08 16:27:56 UTC (rev 2944)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-09-09 12:55:48 UTC (rev 2945)
@@ -257,7 +257,8 @@
 
   /* check for network connection */
   if (priv->registered != MOKO_GSMD_CONNECTION_NETREG_HOME
-      || priv->registered != MOKO_GSMD_CONNECTION_NETREG_ROAMING)
+      && priv->registered != MOKO_GSMD_CONNECTION_NETREG_ROAMING
+      && priv->registered != MOKO_GSMD_CONNECTION_NETREG_DENIED)
   {
     gchar *strings[] = {
       "No Status",
@@ -265,7 +266,7 @@
       "Waiting for network registration",
       "Network registration denied",
       "",
-      "Roaming network reigstered"
+      "Roaming network registered"
     };
 
     dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,