callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkAppChoserWidget: Don't leak the context menu

Browse Source 
This was pointed out in
https://bugzilla.gnome.org/show_bug.cgi?id=720401
This commit is contained in:
Matthias Clasen
2013-12-17 23:20:34 -05:00
parent 37d074da53
commit ad8a97b457
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkappchooserwidget.c
View File

@ -87,6 +87,8 @@ struct _GtkAppChooserWidgetPrivate {
GtkCellRenderer *secondary_padding; GtkCellRenderer *secondary_padding;
GAppInfoMonitor *monitor; GAppInfoMonitor *monitor;
GtkWidget *popup_menu;
}; };
enum { enum {
@ -204,6 +206,15 @@ get_app_info_for_event (GtkAppChooserWidget *self,
return info; return info;
} }
static void
popup_menu_detach (GtkWidget *attach_widget,
GtkMenu *menu)
{
GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (attach_widget);
self->priv->popup_menu = NULL;
}
static gboolean static gboolean
widget_button_press_event_cb (GtkWidget *widget, widget_button_press_event_cb (GtkWidget *widget,
GdkEventButton *event, GdkEventButton *event,
@ -223,10 +234,13 @@ widget_button_press_event_cb (GtkWidget *widget,
if (info == NULL) if (info == NULL)
return FALSE; return FALSE;
menu = gtk_menu_new (); if (self->priv->popup_menu)
gtk_widget_destroy (self->priv->popup_menu);
g_signal_emit (self, signals[SIGNAL_POPULATE_POPUP], 0, self->priv->popup_menu = menu = gtk_menu_new ();
menu, info); gtk_menu_attach_to_widget (GTK_MENU (menu), self, popup_menu_detach);
g_signal_emit (self, signals[SIGNAL_POPULATE_POPUP], 0, menu, info);
g_object_unref (info); g_object_unref (info);
@ -235,12 +249,9 @@ widget_button_press_event_cb (GtkWidget *widget,
n_children = g_list_length (children); n_children = g_list_length (children);
if (n_children > 0) if (n_children > 0)
{
/* actually popup the menu */ /* actually popup the menu */
gtk_menu_attach_to_widget (GTK_MENU (menu), self->priv->program_list, NULL);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
event->button, event->time); event->button, event->time);
}
g_list_free (children); g_list_free (children);
} }