diff options
Diffstat (limited to 'lib/egg')
| -rw-r--r-- | lib/egg/egg-action.c | 11 | ||||
| -rw-r--r-- | lib/egg/egg-menu-merge.c | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/egg/egg-action.c b/lib/egg/egg-action.c index 360ba358e..89886b575 100644 --- a/lib/egg/egg-action.c +++ b/lib/egg/egg-action.c @@ -560,11 +560,14 @@ disconnect_proxy (EggAction *action, GtkWidget *proxy) G_CALLBACK (egg_action_sync_stock_id), proxy); /* menu item specific synchronisers ... */ - g_signal_handlers_disconnect_by_func (action, - G_CALLBACK (egg_action_sync_label), - proxy); + if (GTK_IS_MENU_ITEM (proxy)) + { + g_signal_handlers_disconnect_by_func (action, + G_CALLBACK (egg_action_sync_label), + proxy); - gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL); + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (proxy), NULL); + } /* toolbar button specific synchronisers ... */ g_signal_handlers_disconnect_by_func (action, diff --git a/lib/egg/egg-menu-merge.c b/lib/egg/egg-menu-merge.c index 3bdd73156..bacc34dde 100644 --- a/lib/egg/egg-menu-merge.c +++ b/lib/egg/egg-menu-merge.c @@ -992,8 +992,8 @@ update_node (EggMenuMerge *self, GNode *node) goto recurse_children; } - if (info->action) - g_object_unref (info->action); +/* if (info->action) + g_object_unref (info->action);*/ info->action = action; /* if (info->action) g_object_ref (info->action);*/ |