[gtk+] Revert "Revert "gtkwindow: Reset maximize / fullscreen_initially on state changes""

[Jasper St. Pierre <jstpierre src gnome org>]

commit 8001b2c1b3b9b5535d20ec942c497ae0f0a4adc7
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jul 22 23:16:44 2015 -0400

    Revert "Revert "gtkwindow: Reset maximize / fullscreen_initially on state changes""
    
    This reverts commit de2ea1ebaabd7550ca6f2a02bfbaa04ac92181fd.
    
    No reason in the commit message was given for the revert, and we need
    this for proper behavior on map.

 gtk/gtkwindow.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a0b8f12..0013312 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7623,6 +7623,7 @@ gtk_window_state_event (GtkWidget           *widget,
     {
       priv->fullscreen =
         (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) ? 1 : 0;
+      priv->fullscreen_initially = priv->fullscreen;
     }
 
   if (event->changed_mask & GDK_WINDOW_STATE_TILED)
@@ -7635,6 +7636,7 @@ gtk_window_state_event (GtkWidget           *widget,
     {
       priv->maximized =
         (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) ? 1 : 0;
+      priv->maximize_initially = priv->maximized;
       g_object_notify (G_OBJECT (widget), "is-maximized");
     }