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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2008-03-31 14:54:40 +0200 (Mon, 31 Mar 2008)
New Revision: 4274

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c
Log:
2008-03-31  Thomas Wood  <thomas at openedhand.com>

	* src/dialer/dialer-main.c: (main):
	* src/dialer/moko-keypad.c: (moko_keypad_init):

	Attempt to improve performance by removing use of moko_stock


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-03-31 11:30:00 UTC (rev 4273)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-03-31 12:54:40 UTC (rev 4274)
@@ -1,5 +1,12 @@
 2008-03-31  Thomas Wood  <thomas at openedhand.com>
 
+	* src/dialer/dialer-main.c: (main):
+	* src/dialer/moko-keypad.c: (moko_keypad_init):
+
+	Attempt to improve performance by removing use of moko_stock
+
+2008-03-31  Thomas Wood  <thomas at openedhand.com>
+
 	* src/dialer/dialer-main.c: (dial_clicked_cb), (program_log),
 	(main): Add profiling helper code
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c	2008-03-31 11:30:00 UTC (rev 4273)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/dialer-main.c	2008-03-31 12:54:40 UTC (rev 4274)
@@ -22,8 +22,6 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 
-#include <moko-stock.h>
-
 #include "moko-keypad.h"
 #include "moko-history.h"
 
@@ -132,9 +130,6 @@
   /* application object */
   g_set_application_name ("OpenMoko Dialer");
 
-  program_log ("moko_stock_register");
-  moko_stock_register ();
-
   program_log ("open connection to dbus");
   connection = dbus_g_bus_get (DBUS_BUS_SESSION,
                                &error);
@@ -190,7 +185,7 @@
   data->history = moko_history_new (journal);
   g_signal_connect (data->history, "dial_number", G_CALLBACK (dial_clicked_cb), data);
   gtk_notebook_append_page (GTK_NOTEBOOK (data->notebook), data->history,
-                            gtk_image_new_from_stock (MOKO_STOCK_CALL_HISTORY,
+                            gtk_image_new_from_icon_name ("moko-call-history",
                                                       GTK_ICON_SIZE_BUTTON));
   gtk_container_child_set (GTK_CONTAINER (data->notebook), data->history,
                            "tab-expand", TRUE,

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c	2008-03-31 11:30:00 UTC (rev 4273)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/dialer/moko-keypad.c	2008-03-31 12:54:40 UTC (rev 4274)
@@ -20,8 +20,6 @@
 #include <gtk/gtk.h>
 #include <gtk/gtk.h>
 
-#include <moko-stock.h>
-
 #include "moko-keypad.h"
 
 #include "moko-contacts.h"
@@ -355,7 +353,6 @@
 {
   MokoKeypadPrivate *priv;
   GtkWidget *hbox, *vbox;
-  GtkStockItem stock_item;
   GtkWidget *bvbox, *icon, *label, *align;
 
   priv = keypad->priv = MOKO_KEYPAD_GET_PRIVATE (keypad);
@@ -411,11 +408,10 @@
   bvbox = gtk_vbox_new (FALSE, 0);
   align = gtk_alignment_new (0.5, 0.5, 1, 0);
   
-  icon = gtk_image_new_from_stock (MOKO_STOCK_CALL_DIAL, GTK_ICON_SIZE_BUTTON);
+  icon = gtk_image_new_from_icon_name ("moko-call-dial", GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (bvbox), icon, FALSE, FALSE, 0);
   
-  gtk_stock_lookup (MOKO_STOCK_CALL_DIAL, &stock_item);
-  label = gtk_label_new (stock_item.label);
+  label = gtk_label_new ("Dial");
   priv->dial_label = label;
   gtk_box_pack_start (GTK_BOX (bvbox), label, FALSE, FALSE, 0);