X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-conf.c;h=07db3b58c21e5d07e16d8789a285f2ad20978450;hb=e1ada75b2678c524f5089f6b83f2547aa3ee1fd7;hp=ed2f9178c7c6d26977b0e840bf8632c7e287ae4f;hpb=2d983f3e5bd2d5f531cbcbdcebe078034ddb8955;p=pspp

diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c
index ed2f9178c7..07db3b58c2 100644
--- 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
@@ -95,7 +95,6 @@ static void
 psppire_conf_finalize (GObject *object)
 {
   PsppireConf *conf = PSPPIRE_CONF (object);
-  g_mutex_free (conf->mutex);
   g_key_file_free (conf->keyfile);
   g_free (conf->filename);
 }
@@ -134,6 +133,7 @@ psppire_conf_class_init (PsppireConfClass *class)
   object_class->finalize = psppire_conf_finalize;
   object_class->dispose = psppire_conf_dispose;
   object_class->constructor = psppire_conf_construct;
+
 }
 
 
@@ -142,8 +142,6 @@ psppire_conf_init (PsppireConf *conf)
 {
   const gchar *dirname = g_get_user_config_dir ();
 
-  conf->mutex = g_mutex_new ();
-
   conf->filename = g_strdup_printf ("%s/%s", dirname, "psppirerc");
 
   conf->keyfile = g_key_file_new ();
@@ -166,8 +164,6 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base,
 {
   gboolean ok;
   GError *err = NULL;
-
-  g_mutex_lock (conf->mutex);
   conf_read (conf);
   *value = g_key_file_get_integer (conf->keyfile,
 				   base,
@@ -177,9 +173,6 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base,
   if ( err != NULL )
     g_error_free (err);
 
-
-  g_mutex_unlock (conf->mutex);
-
   return ok;
 }
 
@@ -190,8 +183,6 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base,
   gboolean ok;
   gboolean b;
   GError *err = NULL;
-  g_mutex_lock (conf->mutex);
-
   conf_read (conf);
   b = g_key_file_get_boolean (conf->keyfile,
 			      base,
@@ -204,8 +195,6 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base,
   if (ok)
     *value = b;
 
-  g_mutex_unlock (conf->mutex);
-
   return ok;
 }
 
@@ -215,10 +204,8 @@ psppire_conf_set_int (PsppireConf *conf,
 		      const gchar *base, const gchar *name,
 		      gint value)
 {
-  g_mutex_lock (conf->mutex);
   g_key_file_set_integer (conf->keyfile, base, name, value);
   conf_write (conf);
-  g_mutex_unlock (conf->mutex);
 }
 
 void
@@ -226,10 +213,8 @@ psppire_conf_set_boolean (PsppireConf *conf,
 			  const gchar *base, const gchar *name,
 			  gboolean value)
 {
-  g_mutex_lock (conf->mutex);
   g_key_file_set_boolean (conf->keyfile, base, name, value);
   conf_write (conf);
-  g_mutex_unlock (conf->mutex);
 }
 
 /*
@@ -277,36 +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;
 
-	psppire_conf_set_int (conf, base, "height", event->height);
-	psppire_conf_set_int (conf, base, "width", event->width);
+  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, "x", event->x);
-	psppire_conf_set_int (conf, base, "y", event->y);
-      }
-      break;
-    case GDK_WINDOW_STATE:
-      {
-	GdkEventWindowState *event = &e->window_state;
+  if (!maximized)
+    {
+      gint width, height;
+      gint x, y;
 
-	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);
+    }
 }