Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/muktupavels/fix-critical-warning' into 'gtk-3-24'

Browse Source 
menu: fix critical warning

See merge request GNOME/gtk!1182
This commit is contained in:
Matthias Clasen
2020-01-17 18:16:42 +00:00
parent 9f9fdd6caa e34037b015
commit c6ce7fedd5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkmenu.c
View File

@@ -3343,17 +3343,20 @@ menu_grab_transfer_window_get (GtkMenu *menu)
static void
menu_grab_transfer_window_destroy (GtkMenu *menu)
{
GtkMenuPrivate *priv = menu->priv;
GdkWindow *window = g_object_get_data (G_OBJECT (menu), "gtk-menu-transfer-window");
if (window)
{
GdkWindow *widget_window;
GdkWindow *toplevel_window;
gtk_widget_unregister_window (GTK_WIDGET (menu), window);
gdk_window_destroy (window);
g_object_set_data (G_OBJECT (menu), I_("gtk-menu-transfer-window"), NULL);
widget_window = gtk_widget_get_window (GTK_WIDGET (menu));
g_object_set_data (G_OBJECT (widget_window), I_("gdk-attached-grab-window"), window);
toplevel_window = gtk_widget_get_window (priv->toplevel);
if (toplevel_window != NULL)
g_object_set_data (G_OBJECT (toplevel_window), I_("gdk-attached-grab-window"), NULL);
}
}