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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-05-28 13:46:26 +0300 (Mon, 28 May 2007)
New Revision: 11886

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkaction.c
Log:
	Merge from upstream, Fixes: #NB53826

        2007-05-25  Xan Lopez  <xan at gnome.org>

        * gtk/gtkaction.c: (gtk_action_set_short_label):
        Use private->data->short_label to update the proxies. (#440780)


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-28 10:38:51 UTC (rev 11885)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-28 10:46:26 UTC (rev 11886)
@@ -1,5 +1,14 @@
 2007-05-28  Xan Lopez  <xan.lopez at nokia.com>
+	
+	Merge from upstream, Fixes: #NB53826
 
+        2007-05-25  Xan Lopez  <xan at gnome.org>
+
+        * gtk/gtkaction.c: (gtk_action_set_short_label):
+        Use private->data->short_label to update the proxies. (#440780)
+
+2007-05-28  Xan Lopez  <xan.lopez at nokia.com>
+
 	* gtk/gtkmenushell.c: use the XTest extension to emit button press/release
 	events from the GtkMenuShell handlers. With this it will appear as if the
 	menu didn't have a grab, and the user will be able to do things like opening

Modified: projects/haf/trunk/gtk+/gtk/gtkaction.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkaction.c	2007-05-28 10:38:51 UTC (rev 11885)
+++ projects/haf/trunk/gtk+/gtk/gtkaction.c	2007-05-28 10:46:26 UTC (rev 11886)
@@ -1335,7 +1335,7 @@
 
       if (GTK_IS_TOOL_BUTTON (proxy))
 	gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy), 
-				   action->private_data->label);
+				   action->private_data->short_label);
       else if (GTK_IS_BUTTON (proxy) &&
 	       !gtk_button_get_use_stock (GTK_BUTTON (proxy)))
 	{
@@ -1343,7 +1343,7 @@
 	  
 	  if (child == NULL || GTK_IS_LABEL (child))
 	    gtk_button_set_label (GTK_BUTTON (proxy), 
-				  action->private_data->label);
+				  action->private_data->short_label);
 	}
     }