[gtk+/wip/gmenu: 74/87] GtkApplicationWindow: Consistently unparent menubar

[Ryan Lortie <ryanl src gnome org>]

commit 7543af09dc25b3b398a6d82a5cf8a8f9c31c9af0
Author: Colin Walters <walters verbum org>
Date:   Thu Dec 1 22:13:56 2011 -0500

    GtkApplicationWindow: Consistently unparent menubar
    
    We create it floating, and don't hold an extra ref, so we should
    just unparent it.

 gtk/gtkapplicationwindow.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 31b3d9d..68c39fd 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)