diff options
Diffstat (limited to 'lib/egg/egg-action.c')
| -rw-r--r-- | lib/egg/egg-action.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/egg/egg-action.c b/lib/egg/egg-action.c index aba6d59db..054159f45 100644 --- a/lib/egg/egg-action.c +++ b/lib/egg/egg-action.c @@ -549,10 +549,6 @@ connect_proxy (EggAction *action, GtkWidget *proxy) g_signal_connect_object (action, "notify::short_label", G_CALLBACK (egg_action_sync_short_label), proxy, 0); - egg_action_sync_tooltip (action, NULL, proxy); - g_signal_connect_object (action, "notify::tooltip", - G_CALLBACK (egg_action_sync_tooltip), - proxy, 0); g_object_set (G_OBJECT (proxy), "stock_id", action->stock_id, NULL); g_signal_connect_object (action, "notify::stock_id", @@ -566,6 +562,14 @@ connect_proxy (EggAction *action, GtkWidget *proxy) G_CALLBACK (egg_action_activate), action, G_CONNECT_SWAPPED); } + + if (EGG_IS_TOOL_ITEM (proxy)) + { + egg_action_sync_tooltip (action, NULL, proxy); + g_signal_connect_object (action, "notify::tooltip", + G_CALLBACK (egg_action_sync_tooltip), + proxy, 0); + } } static void @@ -597,6 +601,10 @@ disconnect_proxy (EggAction *action, GtkWidget *proxy) g_signal_handlers_disconnect_by_func (action, G_CALLBACK (egg_action_sync_stock_id), proxy); + g_signal_handlers_disconnect_by_func (proxy, + G_CALLBACK (egg_action_sync_tooltip), + action); + /* menu item specific synchronisers ... */ g_signal_handlers_disconnect_by_func (action, G_CALLBACK (egg_action_sync_label), |