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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-06-05 14:09:04 +0300 (Fri, 05 Jun 2009)
New Revision: 18625

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktoolbar.c
Log:
2009-06-05  Kristian Rietveld  <kris at lanedo.com>

	Fixes: NB#114454 - Not possible to set hildon icon size to toolbar
	resulting in different sizes of thumbnails.

	Merge from upstream, excluding the later reverted change in
	GtkSettings:

    2008-10-11  Matthias Clasen  <mclasen at redhat.com>

        Bug 555186 - Setting gtk-toolbar-icon-size with custom icon_size

        * gtk/gtktoolbar.c: Turn GtkToolbar::icon-size and
        GtkSettings::gtk-toolbar-icon-size into int properties, to
        allow the use of app-registered icon sizes.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-06-05 11:02:42 UTC (rev 18624)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-06-05 11:09:04 UTC (rev 18625)
@@ -1,5 +1,21 @@
 2009-06-05  Kristian Rietveld  <kris at lanedo.com>
 
+	Fixes: NB#114454 - Not possible to set hildon icon size to toolbar
+	resulting in different sizes of thumbnails.
+
+	Merge from upstream, excluding the later reverted change in
+	GtkSettings:
+
+    2008-10-11  Matthias Clasen  <mclasen at redhat.com>
+
+        Bug 555186 – Setting gtk-toolbar-icon-size with custom icon_size
+
+        * gtk/gtktoolbar.c: Turn GtkToolbar::icon-size and
+        GtkSettings::gtk-toolbar-icon-size into int properties, to
+        allow the use of app-registered icon sizes.
+
+2009-06-05  Kristian Rietveld  <kris at lanedo.com>
+
 	Addresses: NB#106177 - No API to enable alphanumeric input mode
 	with numeric mode as default
 

Modified: projects/haf/trunk/gtk+/gtk/gtktoolbar.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktoolbar.c	2009-06-05 11:02:42 UTC (rev 18624)
+++ projects/haf/trunk/gtk+/gtk/gtktoolbar.c	2009-06-05 11:09:04 UTC (rev 18625)
@@ -543,12 +543,12 @@
    */
   g_object_class_install_property (gobject_class,
 				   PROP_ICON_SIZE,
-				   g_param_spec_enum ("icon-size",
-						      P_("Icon size"),
-						      P_("Size of icons in this toolbar"),
-						      GTK_TYPE_ICON_SIZE,
-						      DEFAULT_ICON_SIZE,
-						      GTK_PARAM_READWRITE));  
+				   g_param_spec_int ("icon-size",
+						     P_("Icon size"),
+						     P_("Size of icons in this toolbar"),
+						     0, G_MAXINT,
+						     DEFAULT_ICON_SIZE,
+						     GTK_PARAM_READWRITE));  
 
   /**
    * GtkToolbar:icon-size-set:
@@ -742,7 +742,7 @@
       gtk_toolbar_set_tooltips (toolbar, g_value_get_boolean (value));
       break;
     case PROP_ICON_SIZE:
-      gtk_toolbar_set_icon_size (toolbar, g_value_get_enum (value));
+      gtk_toolbar_set_icon_size (toolbar, g_value_get_int (value));
       break;
     case PROP_ICON_SIZE_SET:
       if (g_value_get_boolean (value))
@@ -780,7 +780,7 @@
       g_value_set_boolean (value, gtk_toolbar_get_tooltips (toolbar));
       break;
     case PROP_ICON_SIZE:
-      g_value_set_enum (value, gtk_toolbar_get_icon_size (toolbar));
+      g_value_set_int (value, gtk_toolbar_get_icon_size (toolbar));
       break;
     case PROP_ICON_SIZE_SET:
       g_value_set_boolean (value, toolbar->icon_size_set);