r2913 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . libtaku src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-09-05 13:43:46 +0200 (Wed, 05 Sep 2007)
New Revision: 2913

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
Log:
* libtaku/taku-launcher-tile.c: (taku_launcher_tile_class_init): Update with
changes in r1644 of upstream (matchbox-desktop-2: Rename TakuIcon icon size to
taku-icon, to match GTK+.)
* src/today-launcher.c: (today_launcher_page_create): Update for above changes


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-09-05 08:46:13 UTC (rev 2912)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-09-05 11:43:46 UTC (rev 2913)
@@ -1,3 +1,10 @@
+2007-09-05  Thomas Wood  <thomas at openedhand.com>
+
+	* libtaku/taku-launcher-tile.c: (taku_launcher_tile_class_init): Update with
+	changes in r1644 of upstream (matchbox-desktop-2: Rename TakuIcon icon size to
+	taku-icon, to match GTK+.)
+	* src/today-launcher.c: (today_launcher_page_create): Update for above changes
+
 2007-09-02	Michael Lauer <mickey at openmoko.org>
 
 	* src/today-pim-summary.c: (today_pim_summary_update_date):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c	2007-09-05 08:46:13 UTC (rev 2912)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/libtaku/taku-launcher-tile.c	2007-09-05 11:43:46 UTC (rev 2913)
@@ -165,10 +165,10 @@
   object_class->finalize = taku_launcher_tile_finalize;
   
   /* Lookup the icon size from the theme. */
-  icon_size = gtk_icon_size_from_name ("TakuIcon");
+  icon_size = gtk_icon_size_from_name ("taku-icon");
   /* If the icon name isn't registered, use button sized icons as a fallback. */
   if (icon_size == GTK_ICON_SIZE_INVALID) {
-    g_warning ("TakuIcon size not registered, falling back");
+    g_warning ("taku-icon size not registered, falling back");
     icon_size = GTK_ICON_SIZE_BUTTON;
   }
 }

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c	2007-09-05 08:46:13 UTC (rev 2912)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c	2007-09-05 11:43:46 UTC (rev 2913)
@@ -331,7 +331,7 @@
 	viewport = gtk_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport),
 				      GTK_SHADOW_NONE);
-	gtk_icon_size_register ("TakuIcon", 64, 64);
+	gtk_icon_size_register ("taku-icon", 64, 64);
 	data->launcher_table = taku_table_new ();
 
 	/* Create search category */