X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-conf.c;h=1f5914ed722751eb8c6d1830be960b4540ef11c4;hb=5b2ed095a8aaa98adaea4922855edcbfb619c728;hp=2629fdcfc00b668f38b46ce3784283a5e0e316a0;hpb=96994a54e60e9c95b8bba54c2281acf7059b1203;p=pspp

diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c
index 2629fdcfc0..1f5914ed72 100644
--- a/src/ui/gui/psppire-conf.c
+++ b/src/ui/gui/psppire-conf.c
@@ -28,44 +28,13 @@
 
 #include "psppire-conf.h"
 
-static void psppire_conf_init            (PsppireConf      *conf);
-static void psppire_conf_class_init      (PsppireConfClass *class);
+G_DEFINE_TYPE (PsppireConf, psppire_conf, G_TYPE_OBJECT)
 
 static void psppire_conf_finalize        (GObject   *object);
 static void psppire_conf_dispose        (GObject   *object);
 
 static GObjectClass *parent_class = NULL;
 
-
-GType
-psppire_conf_get_type (void)
-{
-  static GType conf_type = 0;
-
-  if (!conf_type)
-    {
-      static const GTypeInfo conf_info =
-      {
-	sizeof (PsppireConfClass),
-	NULL,		/* base_init */
-	NULL,		/* base_finalize */
-        (GClassInitFunc) psppire_conf_class_init,
-	NULL,		/* class_finalize */
-	NULL,		/* class_data */
-        sizeof (PsppireConf),
-	0,
-        (GInstanceInitFunc) psppire_conf_init,
-      };
-
-      conf_type = g_type_register_static (G_TYPE_OBJECT,
-						"PsppireConf",
-						&conf_info, 0);
-    }
-
-  return conf_type;
-}
-
-
 static void
 conf_read (PsppireConf *conf)
 {
@@ -84,7 +53,8 @@ flush_conf (PsppireConf *conf)
 
   if (! g_file_set_contents (conf->filename, kf, length, NULL))
     {
-      g_warning ("Cannot open %s for writing", conf->filename);
+      char *msg = strerror (errno);
+      g_warning ("Cannot open %s for writing: %s", conf->filename, msg);
     }
 
   g_free (kf);
@@ -148,7 +118,6 @@ psppire_conf_class_init (PsppireConfClass *class)
   object_class->finalize = psppire_conf_finalize;
   object_class->dispose = psppire_conf_dispose;
   object_class->constructor = psppire_conf_construct;
-
 }
 
 
@@ -169,7 +138,6 @@ psppire_conf_init (PsppireConf *conf)
 
   conf->keyfile = g_key_file_new ();
 
-  conf->dispose_has_run = FALSE;
   conf->idle = 0;
 }