AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

shortcutswindow: Unset search_bar in dispose

Browse Source 
And check for null-ness in unmap. This prevents a crash when the window
is first disposed and then unmapped.
This commit is contained in:
Timm Bäder 2017-01-12 17:13:19 +01:00
parent 5dbf8458f5
commit 2a84be4ae5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkshortcutswindow.c
View File

@ -669,6 +669,7 @@ gtk_shortcuts_window_dispose (GObject *object)
gtk_container_remove (GTK_CONTAINER (self), GTK_WIDGET (priv->main_box));
priv->main_box = NULL;
priv->stack = NULL;
priv->search_bar = NULL;
}
G_OBJECT_CLASS (gtk_shortcuts_window_parent_class)->dispose (object);
@ -739,7 +740,8 @@ gtk_shortcuts_window_unmap (GtkWidget *widget)
GtkShortcutsWindow *self = (GtkShortcutsWindow *)widget;
GtkShortcutsWindowPrivate *priv = gtk_shortcuts_window_get_instance_private (self);
gtk_search_bar_set_search_mode (priv->search_bar, FALSE);
if (priv->search_bar)
gtk_search_bar_set_search_mode (priv->search_bar, FALSE);
GTK_WIDGET_CLASS (gtk_shortcuts_window_parent_class)->unmap (widget);
}