diff options
| author | Colin Walters <walters@verbum.org> | 2011-12-01 22:13:56 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2011-12-19 12:51:10 -0500 |
| commit | c7e72375598560e2b58c7658440df992d632e92d (patch) | |
| tree | faa4c84d5af219cf0fe2783ba85cc20ff411850e /gtk/gtkapplicationwindow.c | |
| parent | c2999634283ef538689252e943931e8f443d5244 (diff) | |
| download | gtk+-c7e72375598560e2b58c7658440df992d632e92d.tar.gz | |
GtkApplicationWindow: Consistently unparent menubar
We create it floating, and don't hold an extra ref, so we should
just unparent it.
Diffstat (limited to 'gtk/gtkapplicationwindow.c')
| -rw-r--r-- | gtk/gtkapplicationwindow.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 31b3d9dbd6..68c39fd0c6 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -87,7 +87,6 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window) if (have_menubar && !should_have_menubar) { gtk_widget_unparent (window->priv->menubar); - g_object_unref (window->priv->menubar); window->priv->menubar = NULL; gtk_widget_queue_resize (GTK_WIDGET (window)); @@ -503,7 +502,11 @@ gtk_application_window_dispose (GObject *object) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (object); - g_clear_object (&window->priv->menubar); + if (window->priv->menubar) + { + gtk_widget_unparent (window->priv->menubar); + window->priv->menubar = NULL; + } g_clear_object (&window->priv->actions); G_OBJECT_CLASS (gtk_application_window_parent_class) |