Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use private->data->short_label to update the proxies.

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


svn path=/branches/gtk-2-10/; revision=17919
This commit is contained in:
Xan Lopez
2007-05-25 21:16:35 +00:00
parent e20be40451
commit f9a2e66995
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -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:

4
gtk/gtkaction.c
View File

@@ -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);
}
}