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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-03-13 16:43:21 +0200 (Tue, 13 Mar 2007)
New Revision: 10549

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkenums.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c
Log:
	* gtk/gtkenums.h:
	* gtk/gtkiconfactory.c:
	* gtk/gtkstyle.c:

	Remove the HILDON_ICON_SIZE_* stuff from the stock enums.


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 14:22:58 UTC (rev 10548)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 14:43:21 UTC (rev 10549)
@@ -1,3 +1,11 @@
+2007-03-13  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkenums.h:
+	* gtk/gtkiconfactory.c:
+	* gtk/gtkstyle.c:
+
+	Remove the HILDON_ICON_SIZE_* stuff from the stock enums.
+
 2007-03-13  Michael Natterer  <mitch at imendio.com>
 
 	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): added missing

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkenums.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkenums.h	2007-03-13 14:22:58 UTC (rev 10548)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkenums.h	2007-03-13 14:43:21 UTC (rev 10549)
@@ -132,14 +132,7 @@
   GTK_ICON_SIZE_LARGE_TOOLBAR,
   GTK_ICON_SIZE_BUTTON,
   GTK_ICON_SIZE_DND,
-  GTK_ICON_SIZE_DIALOG,
-
-#ifdef MAEMO_CHANGES
-  HILDON_ICON_SIZE_26,
-  HILDON_ICON_SIZE_40,
-  HILDON_ICON_SIZE_50,
-  HILDON_ICON_SIZE_64
-#endif /* MAEMO_CHANGES */
+  GTK_ICON_SIZE_DIALOG
 } GtkIconSize;
 
 /* automatic sensitivity */

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c	2007-03-13 14:22:58 UTC (rev 10548)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkiconfactory.c	2007-03-13 14:43:21 UTC (rev 10549)
@@ -550,6 +550,17 @@
 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)
 {
@@ -1505,12 +1516,7 @@
   tmp_source.source.pixbuf = tmp_pixbuf;
 
   pixbuf = gtk_style_render_icon (style, &tmp_source,
-#ifdef MAEMO_CHANGES
-				  direction, state,
-				  (size < HILDON_ICON_SIZE_26) ? -1 : size,
-#else   /* !MAEMO_CHANGES */
                                   direction, state, -1,
-#endif /* !MAEMO_CHANGES */
 				  widget, detail);
 
   if (!pixbuf)

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c	2007-03-13 14:22:58 UTC (rev 10548)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkstyle.c	2007-03-13 14:43:21 UTC (rev 10549)
@@ -2126,11 +2126,7 @@
   /* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
    * leave it alone.
    */
-  if (size != (GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded (source)
-#ifdef MAEMO_CHANGES
-      && size < HILDON_ICON_SIZE_26
-#endif /* MAEMO_CHANGES */
-      )
+  if (size != (GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded (source))
     scaled = scale_or_ref (base_pixbuf, width, height);
   else
     scaled = g_object_ref (base_pixbuf);