Merge master into gtk3.

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

diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c
index 561f933ff061369243647d6e791e471072adac29..09f6d68a124b5cabaa2c6e5d07fb0aefc1be4c14 100644 (file)
--- a/src/ui/gui/psppire-conf.c
+++ b/src/ui/gui/psppire-conf.c
@@ -337,10 +337,11 @@ psppire_conf_save_window_geometry (PsppireConf *conf,
 
   if (!maximized)
     {
-      gint width, height;
       gint x, y;
 
-      gdk_drawable_get_size (w, &width, &height);
+      gint width = gdk_window_get_width (w);
+      gint height= gdk_window_get_height (w);
+
       gdk_window_get_position (w, &x, &y);
 
       psppire_conf_set_int (conf, base, "height", height);