diff --git a/ChangeLog b/ChangeLog
index a26a9cc53d..73c93d5e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-25  Xan Lopez  <xan@gnome.org>
+
+	* gtk/gtkaction.c: (gtk_action_set_short_label):
+	Use private->data->short_label to update the proxies.
+
 2007-05-25  Matthias Clasen  <mclasen@redhat.com>
 
 	Merged from trunk:
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 630159b3a2..1bb0de31ec 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -1335,7 +1335,7 @@ gtk_action_set_short_label (GtkAction	*action,
 
       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 @@ gtk_action_set_short_label (GtkAction	*action,
 	  
 	  if (child == NULL || GTK_IS_LABEL (child))
 	    gtk_button_set_label (GTK_BUTTON (proxy), 
-				  action->private_data->label);
+				  action->private_data->short_label);
 	}
     }