projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireKeypad: Remove gdkkeysyms-compat.h
[pspp]
/
src
/
ui
/
gui
/
psppire-conf.c
diff --git
a/src/ui/gui/psppire-conf.c
b/src/ui/gui/psppire-conf.c
index dbcdf0e01f08d94907fedab3e43486e2a874c812..09f6d68a124b5cabaa2c6e5d07fb0aefc1be4c14 100644
(file)
--- a/
src/ui/gui/psppire-conf.c
+++ b/
src/ui/gui/psppire-conf.c
@@
-24,6
+24,8
@@
#include <stdio.h>
#include <sys/stat.h>
#include <stdio.h>
#include <sys/stat.h>
+#include <glib.h>
+
#include "psppire-conf.h"
static void psppire_conf_init (PsppireConf *conf);
#include "psppire-conf.h"
static void psppire_conf_init (PsppireConf *conf);
@@
-73,8
+75,8
@@
conf_read (PsppireConf *conf)
NULL);
}
NULL);
}
-static
void
-
conf_write
(PsppireConf *conf)
+static
gboolean
+
flush_conf
(PsppireConf *conf)
{
gsize length = 0;
{
gsize length = 0;
@@
-86,8
+88,19
@@
conf_write (PsppireConf *conf)
}
g_free (kf);
}
g_free (kf);
+ conf->idle = 0;
+ return FALSE;
+}
+
+static void
+conf_write (PsppireConf *conf)
+{
+ if ( conf->idle == 0)
+ conf->idle = g_idle_add_full (G_PRIORITY_LOW,
+ (GSourceFunc) flush_conf, conf, NULL);
}
}
+
static void
psppire_conf_dispose (GObject *object)
{
static void
psppire_conf_dispose (GObject *object)
{
@@
-150,13
+163,14
@@
psppire_conf_init (PsppireConf *conf)
to want to put files there. */
dirname = g_get_user_config_dir ();
if (stat (dirname, &s) == -1 && errno == ENOENT)
to want to put files there. */
dirname = g_get_user_config_dir ();
if (stat (dirname, &s) == -1 && errno == ENOENT)
- mkdir (dirname, 07
77
);
+ mkdir (dirname, 07
00
);
conf->filename = g_strdup_printf ("%s/%s", dirname, "psppirerc");
conf->keyfile = g_key_file_new ();
conf->dispose_has_run = FALSE;
conf->filename = g_strdup_printf ("%s/%s", dirname, "psppirerc");
conf->keyfile = g_key_file_new ();
conf->dispose_has_run = FALSE;
+ conf->idle = 0;
}
}
@@
-209,6
+223,31
@@
psppire_conf_get_boolean (PsppireConf *conf, const gchar *base,
}
}
+
+gboolean
+psppire_conf_get_string (PsppireConf *conf, const gchar *base,
+ const gchar *name, gchar **value)
+{
+ gboolean ok;
+ gchar *b;
+ GError *err = NULL;
+ conf_read (conf);
+ b = g_key_file_get_string (conf->keyfile,
+ base,
+ name, &err);
+
+ ok = (err == NULL);
+ if ( err != NULL )
+ g_error_free (err);
+
+ if (ok)
+ *value = b;
+
+ return ok;
+}
+
+
+
void
psppire_conf_set_int (PsppireConf *conf,
const gchar *base, const gchar *name,
void
psppire_conf_set_int (PsppireConf *conf,
const gchar *base, const gchar *name,
@@
-227,6
+266,18
@@
psppire_conf_set_boolean (PsppireConf *conf,
conf_write (conf);
}
conf_write (conf);
}
+
+void
+psppire_conf_set_string (PsppireConf *conf,
+ const gchar *base, const gchar *name,
+ const gchar *value)
+{
+ g_key_file_set_string (conf->keyfile, base, name, value);
+ conf_write (conf);
+}
+
+
+
/*
A convenience function to set the geometry of a
window from from a saved config
/*
A convenience function to set the geometry of a
window from from a saved config
@@
-286,10
+337,11
@@
psppire_conf_save_window_geometry (PsppireConf *conf,
if (!maximized)
{
if (!maximized)
{
- gint width, height;
gint x, y;
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);
gdk_window_get_position (w, &x, &y);
psppire_conf_set_int (conf, base, "height", height);