[maemo-commits] [maemo-commits] r17065 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kalikiana
Date: 2009-01-08 15:38:00 +0200 (Thu, 08 Jan 2009)
New Revision: 17065

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkiconfactory.c
Log:
2009-01-08  Christian Dywan  <christian at imendio.com>

	Fixes: NB#93075 - Update icon size constants to Fremantle

	* gtk/gtkiconfactory.c (init_icon_sizes):
        Remove MAEMO_CHANGES from icon factory




Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-01-08 13:26:50 UTC (rev 17064)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-01-08 13:38:00 UTC (rev 17065)
@@ -1,3 +1,10 @@
+2009-01-08  Christian Dywan  <christian at imendio.com>
+
+	Fixes: NB#93075 - Update icon size constants to Fremantle
+
+	* gtk/gtkiconfactory.c (init_icon_sizes):
+        Remove MAEMO_CHANGES from icon factory
+
 2009-01-07  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Released 2:2.12.12-1maemo6

Modified: projects/haf/trunk/gtk+/gtk/gtkiconfactory.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkiconfactory.c	2009-01-08 13:26:50 UTC (rev 17064)
+++ projects/haf/trunk/gtk+/gtk/gtkiconfactory.c	2009-01-08 13:38:00 UTC (rev 17065)
@@ -550,27 +550,12 @@
 static gint      icon_sizes_allocated = 0;
 static gint      icon_sizes_used = 0;
 
-#ifdef MAEMO_CHANGES
-
-enum {
-  HILDON_ICON_SIZE_26 = GTK_ICON_SIZE_DIALOG + 1,
-  HILDON_ICON_SIZE_40,
-  HILDON_ICON_SIZE_50,
-  HILDON_ICON_SIZE_64
-};
-
-#endif /* MAEMO_CHANGES */
-
 static void
 init_icon_sizes (void)
 {
   if (icon_sizes == NULL)
     {
-#ifdef MAEMO_CHANGES
-#define NUM_BUILTIN_SIZES 11
-#else  /* !MAEMO_CHANGES */
 #define NUM_BUILTIN_SIZES 7
-#endif /* !MAEMO_CHANGES */
       gint i;
 
       icon_aliases = g_hash_table_new (g_str_hash, g_str_equal);
@@ -620,31 +605,7 @@
       icon_sizes[GTK_ICON_SIZE_DIALOG].width = 48;
       icon_sizes[GTK_ICON_SIZE_DIALOG].height = 48;
 
-#ifdef MAEMO_CHANGES
-      icon_sizes[HILDON_ICON_SIZE_26].size = HILDON_ICON_SIZE_26;
-      icon_sizes[HILDON_ICON_SIZE_26].name = "hildon-26";
-      icon_sizes[HILDON_ICON_SIZE_26].width = 26;
-      icon_sizes[HILDON_ICON_SIZE_26].height = 26;
-
-      icon_sizes[HILDON_ICON_SIZE_40].size = HILDON_ICON_SIZE_40;
-      icon_sizes[HILDON_ICON_SIZE_40].name = "hildon-40";
-      icon_sizes[HILDON_ICON_SIZE_40].width = 40;
-      icon_sizes[HILDON_ICON_SIZE_40].height = 40;
-
-      icon_sizes[HILDON_ICON_SIZE_50].size = HILDON_ICON_SIZE_50;
-      icon_sizes[HILDON_ICON_SIZE_50].name = "hildon-50";
-      icon_sizes[HILDON_ICON_SIZE_50].width = 50;
-      icon_sizes[HILDON_ICON_SIZE_50].height = 50;
-
-      icon_sizes[HILDON_ICON_SIZE_64].size = HILDON_ICON_SIZE_64;
-      icon_sizes[HILDON_ICON_SIZE_64].name = "hildon-64";
-      icon_sizes[HILDON_ICON_SIZE_64].width = 54;
-      icon_sizes[HILDON_ICON_SIZE_64].height = 64;
-
-      g_assert ((HILDON_ICON_SIZE_64 + 1) == NUM_BUILTIN_SIZES);
-#else  /* !MAEMO_CHANGES */
       g_assert ((GTK_ICON_SIZE_DIALOG + 1) == NUM_BUILTIN_SIZES);
-#endif /* !MAEMO_CHANGES */
 
       /* Alias everything to itself. */
       i = 1; /* skip invalid size */