diff options
| author | John Ralls <jralls@src.gnome.org> | 2010-10-15 13:10:25 -0700 |
|---|---|---|
| committer | John Ralls <jralls@src.gnome.org> | 2010-10-15 13:14:19 -0700 |
| commit | 27ad64dccf24f4fed74f6204a2fc257178d8ff6f (patch) | |
| tree | e099a6ca53f931527cba3e5b27aaa1d5ff0329cb /gtk/gtkmenuitem.c | |
| parent | 80d3f1fcda15992749e20ed63f9e56a93f5357fd (diff) | |
| download | gtk+-27ad64dccf24f4fed74f6204a2fc257178d8ff6f.tar.gz | |
Bug 631719 - Restore second, more important, call to set label from the menu item.
Diffstat (limited to 'gtk/gtkmenuitem.c')
| -rw-r--r-- | gtk/gtkmenuitem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 3fb01ee45c..0deeda46e4 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1104,15 +1104,18 @@ gtk_menu_item_sync_action_properties (GtkActivatable *activatable, { label = gtk_bin_get_child (GTK_BIN (menu_item)); - /* make sure label is a label */ + /* make sure label is a label, deleting it otherwise */ if (label && !GTK_IS_LABEL (label)) { gtk_container_remove (GTK_CONTAINER (menu_item), label); label = NULL; } - + /* Make sure that menu_item has a label and that any + * accelerators are set */ gtk_menu_item_ensure_label (menu_item); gtk_menu_item_set_use_underline (menu_item, TRUE); + /* Make label point to the menu_item's label */ + label = gtk_bin_get_child (GTK_BIN (menu_item)); if (GTK_IS_ACCEL_LABEL (label) && gtk_action_get_accel_path (action)) { |