From 01bddb73b6a99980148a61d621c0549739f28207 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Tue, 17 Jan 2012 00:30:43 +0100 Subject: ephy-page-menu-action: hang on to our menu --- src/ephy-page-menu-action.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ephy-page-menu-action.c b/src/ephy-page-menu-action.c index b97c6e23b..05efbdb6d 100644 --- a/src/ephy-page-menu-action.c +++ b/src/ephy-page-menu-action.c @@ -88,9 +88,8 @@ button_press_cb (GtkWidget *button, GdkEventButton *event, EphyPageMenuAction *a g_signal_connect (menu, "notify::visible", G_CALLBACK (visible_cb), NULL); - action->priv->menu = menu; + action->priv->menu = g_object_ref (menu); } - if (!button) { GSList *l = gtk_action_get_proxies (GTK_ACTION (action)); @@ -138,11 +137,24 @@ ephy_page_menu_action_disconnect_proxy (GtkAction *action, GTK_ACTION_CLASS (ephy_page_menu_action_parent_class)->disconnect_proxy (action, proxy); } +static void +ephy_page_menu_action_dispose (GObject *object) +{ + EphyPageMenuActionPrivate *priv = EPHY_PAGE_MENU_ACTION (object)->priv; + + g_clear_object (&priv->menu); + + G_OBJECT_CLASS (ephy_page_menu_action_parent_class)->dispose (object); +} + static void ephy_page_menu_action_class_init (EphyPageMenuActionClass *klass) { + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GtkActionClass *action_class = GTK_ACTION_CLASS (klass); + gobject_class->dispose = ephy_page_menu_action_dispose; + action_class->activate = ephy_page_menu_action_activate; action_class->connect_proxy = ephy_page_menu_action_connect_proxy; action_class->disconnect_proxy = ephy_page_menu_action_disconnect_proxy; -- cgit v1.2.3