[maemo-commits] [maemo-commits] r9263 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-01-23 15:34:30 +0200 (Tue, 23 Jan 2007)
New Revision: 9263

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c
Log:
Tue Jan 23 14:33:33 2007  Tim Janik  <timj at imendio.com>

        * gtk/gtkstyle.c (gtk_default_render_icon): fixed MAEMO_CHANGES
        conditionalization overlooked earlier.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 13:30:33 UTC (rev 9262)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-23 13:34:30 UTC (rev 9263)
@@ -1,3 +1,8 @@
+Tue Jan 23 14:33:33 2007  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtkstyle.c (gtk_default_render_icon): fixed MAEMO_CHANGES
+	conditionalization overlooked earlier.
+
 Tue Jan 23 14:11:26 2007  Tim Janik  <timj at imendio.com>
 
 	* gtk/updateiconcache.c:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c	2007-01-23 13:30:33 UTC (rev 9262)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c	2007-01-23 13:34:30 UTC (rev 9263)
@@ -2127,7 +2127,10 @@
    * leave it alone.
    */
   if (size != (GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded (source)
-      /* MAEMO START */ && size < HILDON_ICON_SIZE_26 /* MAEMO END */)
+#ifdef MAEMO_CHANGES
+      && size < HILDON_ICON_SIZE_26
+#endif /* MAEMO_CHANGES */
+      )
     scaled = scale_or_ref (base_pixbuf, width, height);
   else
     scaled = g_object_ref (base_pixbuf);