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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-09-06 15:32:19 +0200 (Thu, 06 Sep 2007)
New Revision: 2932

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:
* src/moko-dialer.c: (moko_dialer_class_init), (moko_dialer_init):
- Add support for displaying GError messages
- Handle new GError in moko_gsmd_connection_set_antenna_power ()


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-09-06 13:27:14 UTC (rev 2931)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-09-06 13:32:19 UTC (rev 2932)
@@ -1,3 +1,9 @@
+2007-09-06  Thomas Wood  <thomas at openedhand.com>
+
+	* src/moko-dialer.c: (moko_dialer_class_init), (moko_dialer_init):
+	- Add support for displaying GError messages
+	- Handle new GError in moko_gsmd_connection_set_antenna_power ()
+
 2007-08-31  Thomas Wood  <thomas at openedhand.com>
 
 	* src/moko-contacts.c: (moko_contacts_get_photo): Check photo before

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-06 13:27:14 UTC (rev 2931)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-09-06 13:32:19 UTC (rev 2932)
@@ -738,10 +738,24 @@
 }
 
 static void
+dialer_display_error (GError *err)
+{
+  GtkWidget *dlg;
+
+  if (!err)
+    return;
+
+  dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Dialer: %s", err->message);
+  gtk_dialog_run (GTK_DIALOG (dlg));
+  gtk_widget_destroy (dlg);
+}
+
+static void
 moko_dialer_init (MokoDialer *dialer)
 {
   MokoDialerPrivate *priv;
   MokoGsmdConnection *conn;
+  GError *err = NULL;
 
   priv = dialer->priv = MOKO_DIALER_GET_PRIVATE (dialer);
 
@@ -753,8 +767,10 @@
 
   /* Init the gsmd connection, and power it up */
   conn = priv->connection = moko_gsmd_connection_new ();
-  moko_gsmd_connection_set_antenna_power (conn, TRUE);
+  moko_gsmd_connection_set_antenna_power (conn, TRUE, &err);
 
+  dialer_display_error (err);
+
   /* Handle network registration a few seconds after powering up the 
    * antenna*/ 
   priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE;