[gtk+] gtkwindow: remove headerbar after disposing parent

[Olivier Fourdan <ofourdan src gnome org>]

commit 103d369ff6ebff489a1b3d8ad99f51a604ce8225
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Wed Nov 25 18:06:53 2015 +0100

    gtkwindow: remove headerbar after disposing parent
    
    Widgets such as gtkfilechooser may be saving their size and position on
    the unmap callback, if the client-side decoration header bar is removed
    first, the reported size will be wrong.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=756618

 gtk/gtkwindow.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 849ff8c..6680ec8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3119,12 +3119,12 @@ gtk_window_dispose (GObject *object)
   GtkWindow *window = GTK_WINDOW (object);
   GtkWindowPrivate *priv = window->priv;
 
-  unset_titlebar (window);
   gtk_window_set_focus (window, NULL);
   gtk_window_set_default (window, NULL);
   remove_attach_widget (window);
 
   G_OBJECT_CLASS (gtk_window_parent_class)->dispose (object);
+  unset_titlebar (window);
 
   while (priv->popovers)
     {