gui: Save positions of windows only when they are closed.

[pspp] / src / ui / gui / psppire-conf.c

diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c
index d9f6800ffd0d494278e29b0ca8a3dc2304b4f6e2..07db3b58c21e5d07e16d8789a285f2ad20978450 100644 (file)
--- a/src/ui/gui/psppire-conf.c
+++ b/src/ui/gui/psppire-conf.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009  Free Software Foundation
+   Copyright (C) 2009, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -181,16 +181,20 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base,
                          const gchar *name, gboolean *value)
 {
   gboolean ok;
+  gboolean b;
   GError *err = NULL;
   conf_read (conf);
-  *value = g_key_file_get_boolean (conf->keyfile,
-                                  base,
-                                  name, &err);
+  b = g_key_file_get_boolean (conf->keyfile,
+                             base,
+                             name, &err);
 
   ok = (err == NULL);
   if ( err != NULL )
     g_error_free (err);
 
+  if (ok)
+    *value = b;
+
   return ok;
 }
 
@@ -258,38 +262,29 @@ psppire_conf_set_window_geometry (PsppireConf *conf,
 void
 psppire_conf_save_window_geometry (PsppireConf *conf,
                                   const gchar *base,
-                                  GdkEvent *e)
+                                  GtkWindow *gtk_window)
 {
-  switch (e->type)
-    {
-    case GDK_CONFIGURE:
-      {
-       GdkEventConfigure *event = &e->configure;
+  gboolean maximized;
+  GdkWindow *w;
 
-       if ( gdk_window_get_state (event->window) &
-            GDK_WINDOW_STATE_MAXIMIZED )
-         return;
+  w = gtk_widget_get_window (GTK_WIDGET (gtk_window));
+  if (w == NULL)
+    return;
 
-       if ( event->send_event )
-         return;
+  maximized = (gdk_window_get_state (w) & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  psppire_conf_set_boolean (conf, base, "maximize", maximized);
 
-       psppire_conf_set_int (conf, base, "height", event->height);
-       psppire_conf_set_int (conf, base, "width", event->width);
+  if (!maximized)
+    {
+      gint width, height;
+      gint x, y;
 
-       psppire_conf_set_int (conf, base, "x", event->x);
-       psppire_conf_set_int (conf, base, "y", event->y);
-      }
-      break;
-    case GDK_WINDOW_STATE:
-      {
-       GdkEventWindowState *event = &e->window_state;
-
-       psppire_conf_set_boolean (conf, base, "maximize",
-                                 event->new_window_state &
-                                 GDK_WINDOW_STATE_MAXIMIZED );
-      }
-      break;
-    default:
-      break;
-    };
+      gdk_drawable_get_size (w, &width, &height);
+      gdk_window_get_position (w, &x, &y);
+
+      psppire_conf_set_int (conf, base, "height", height);
+      psppire_conf_set_int (conf, base, "width", width);
+      psppire_conf_set_int (conf, base, "x", x);
+      psppire_conf_set_int (conf, base, "y", y);
+    }
 }