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

[njp at sita.openmoko.org]

Author: njp
Date: 2007-08-07 14:22:30 +0200 (Tue, 07 Aug 2007)
New Revision: 2660

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-talking.c
Log:
2007-08-07  Neil J. Patel  <njp at o-hand.com>

	* src/dialer-main.c: (main):
	* src/moko-dialer.c: (on_call_progress_changed),
	(moko_dialer_init):
	Make sure the dialer window hides on delete, instead of calling
	gtk_main_quit ().

	* src/moko-talking.c: (moko_talking_init):
	Fix the loading of the incmong and outgoing call images, so there is not a
	gap between them during animation.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-07 12:22:30 UTC (rev 2660)
@@ -1,3 +1,15 @@
+2007-08-07  Neil J. Patel  <njp at o-hand.com>
+
+	* src/dialer-main.c: (main):
+	* src/moko-dialer.c: (on_call_progress_changed),
+	(moko_dialer_init):
+	Make sure the dialer window hides on delete, instead of calling
+	gtk_main_quit ().
+
+	* src/moko-talking.c: (moko_talking_init):
+	Fix the loading of the incmong and outgoing call images, so there is not a
+	gap between them during animation.
+
 2007-08-06  Neil J. Patel  <njp at o-hand.com>
 
 	* src/moko-notify.c: (on_bus_eos), (moko_notify_start_ringtone):

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-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer-main.c	2007-08-07 12:22:30 UTC (rev 2660)
@@ -117,7 +117,7 @@
     g_warning ("Failed to make a connection to the session bus: %s", 
                error->message);
     g_error_free (error);
-    return EXIT_FAILURE;
+    return 1;
   }
   proxy = dbus_g_proxy_new_for_name (connection, 
                                      DBUS_SERVICE_DBUS,
@@ -134,7 +134,7 @@
     gdk_init(&argc, &argv);
     gdk_notify_startup_complete ();
 
-    return EXIT_FAILURE;
+    return 1;
   }
   if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
   {
@@ -151,7 +151,7 @@
 
     gdk_init(&argc, &argv);
     gdk_notify_startup_complete ();
-    return EXIT_SUCCESS;
+    return 0;
   }
 
   /* So we are creating a new dialer, one of the first things we sould do is
@@ -185,5 +185,5 @@
 
   gtk_main ();
   
-  return EXIT_SUCCESS;
+  return 0;
 }

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-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-07 12:22:30 UTC (rev 2660)
@@ -505,12 +505,12 @@
           moko_journal_voice_info_set_was_missed (priv->entry, TRUE);
 
         moko_journal_add_entry (priv->journal, priv->entry);
+        moko_journal_write_to_storage (priv->journal);
         if (priv->time)
           moko_time_free (priv->time);
         priv->entry = NULL;
         priv->time = NULL;
       }
-      moko_journal_write_to_storage (priv->journal);
       moko_notify_stop (priv->notify);
       g_print ("mokogsmd disconnect\n");
       break;
@@ -721,7 +721,7 @@
   /* Create the window */
   priv->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (G_OBJECT (priv->window), "delete-event",
-                    (GCallback) gtk_main_quit, NULL);
+                    (GCallback) gtk_widget_hide_on_delete, NULL);
   gtk_window_set_title (GTK_WINDOW (priv->window), "Dialer");
 
   /* Notebook */

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c	2007-08-07 11:45:17 UTC (rev 2659)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c	2007-08-07 12:22:30 UTC (rev 2660)
@@ -444,7 +444,7 @@
     if (G_IS_OBJECT (priv->talking[i]))
       g_object_ref (priv->talking[i]);
   }
-  for (i = 0; i < N_PICS; i++)
+  for (i = 0; i < N_PICS-1; i++)
   {
     gchar *name = g_strdup_printf ("%s/outgoing_%d.png", PKGDATADIR, i);
     priv->outgoing[i] = gdk_pixbuf_new_from_file (name, NULL);
@@ -452,7 +452,7 @@
     if (G_IS_OBJECT (priv->outgoing[i]))
       g_object_ref (priv->outgoing[i]);
   }
-  for (i = 0; i < N_PICS; i++)
+  for (i = 0; i < N_PICS-1; i++)
   {
     gchar *name = g_strdup_printf ("%s/incoming_%d.png", PKGDATADIR, i);
     priv->incoming[i] = gdk_pixbuf_new_from_file (name, NULL);