diff options
| author | Christian Persch <chpe@gnome.org> | 2007-07-10 18:00:43 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-07-10 18:00:43 +0000 |
| commit | 03970ddcaf7995c6c0b09da717c22ff066b201f4 (patch) | |
| tree | 38b2f6f9b6dece326cd8071e6b66b3385a42bd9b /gtk/gtkaction.c | |
| parent | 75d9d02b7266b86305051c887651c3dfbb669018 (diff) | |
| download | gtk+-03970ddcaf7995c6c0b09da717c22ff066b201f4.tar.gz | |
Remove work-around for the old tooltips code, and just set the action
2007-07-10 Christian Persch <chpe@gnome.org>
* gtk/gtkaction.c: (gtk_action_sync_tooltip),
(gtk_action_set_tooltip):
* gtk/gtkuimanager.c: (update_node): Remove work-around for the old
tooltips code, and just set the action tooltip immediately on the
proxy widget. Bug #455482.
svn path=/trunk/; revision=18437
Diffstat (limited to 'gtk/gtkaction.c')
| -rw-r--r-- | gtk/gtkaction.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 5c257a5bac..49d40c36a5 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -1451,13 +1451,8 @@ static void gtk_action_sync_tooltip (GtkAction *action, GtkWidget *proxy) { - GtkWidget *parent; - - parent = gtk_widget_get_parent (proxy); - - if (GTK_IS_TOOL_ITEM (proxy) && GTK_IS_TOOLBAR (parent)) - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (proxy), - action->private_data->tooltip); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (proxy), + action->private_data->tooltip); } static void @@ -1475,8 +1470,9 @@ gtk_action_set_tooltip (GtkAction *action, for (p = action->private_data->proxies; p; p = p->next) { proxy = (GtkWidget *)p->data; - - gtk_action_sync_tooltip (action, proxy); + + if (GTK_IS_TOOL_ITEM (proxy)) + gtk_action_sync_tooltip (action, proxy); } g_object_notify (G_OBJECT (action), "tooltip"); |