aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorross <ross@b067294f-1dea-0310-9683-c47a78595994>2005-10-03 11:04:17 +0000
committerross <ross@b067294f-1dea-0310-9683-c47a78595994>2005-10-03 11:04:17 +0000
commit61e85619db9f58c31b8fb22c27a1419fe4ac7fd2 (patch)
tree76c58dda0956cacc69c1089bc4cd01630c3dfb1d
parentd84776512bca52e9ad3fb71995421f600ed7a60a (diff)
downloadxsettings-daemon-61e85619db9f58c31b8fb22c27a1419fe4ac7fd2.tar.gz
xsettings-daemon-61e85619db9f58c31b8fb22c27a1419fe4ac7fd2.tar.bz2
xsettings-daemon-61e85619db9f58c31b8fb22c27a1419fe4ac7fd2.zip
Add stylus mode, fix toolbar mode, monitor gnome keys for changes.
git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/settings-daemon@1236 b067294f-1dea-0310-9683-c47a78595994
-rw-r--r--ChangeLog5
-rw-r--r--settings-daemon.c25
2 files changed, 24 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index efa9c6e..0bdddf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-03 Ross Burton <ross@burtonini.com>
+
+ * settings-daemon.c:
+ Add stylus mode, fix toolbar mode, monitor gnome keys for changes.
+
2005-03-14 mallum,,, <mallum@openedhand.com>
* settings-daemon.c: (main):
diff --git a/settings-daemon.c b/settings-daemon.c
index 2d877ea..a2dfc15 100644
--- a/settings-daemon.c
+++ b/settings-daemon.c
@@ -119,13 +119,11 @@ translate_string_string_toolbar (TranslationEntry *trans,
g_assert (value->type == trans->gconf_type);
- /* This is kind of a workaround since GNOME expects the key value to be
- * "both_horiz" and gtk+ wants the XSetting to be "both-horiz".
-
tmp = gconf_value_get_string (value);
- if (tmp && strcmp (tmp, "both_horiz") == 0)
- tmp = "both-horiz";
- */
+ /* Is this still needed?
+ if (tmp && strcmp (tmp, "both_horiz") == 0)
+ tmp = "both-horiz";
+ */
for (i = 0; managers [i]; i++)
xsettings_manager_set_string (managers [i],
@@ -172,6 +170,8 @@ static TranslationEntry translations [] = {
GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/menus_have_icons", "Gtk/MenuImages",
GCONF_VALUE_BOOL, translate_bool_int },
+ { "/desktop/gnome/interface/stylus_mode", "Gtk/StylusMode",
+ GCONF_VALUE_BOOL, translate_bool_int },
};
static TranslationEntry*
@@ -722,6 +722,19 @@ main(int argc, char **argv)
sd_settings_xsettings_load (gconf_client);
gconf_client_add_dir(gconf_client,
+ "/desktop/gnome",
+ /* GCONF_CLIENT_PRELOAD_NONE */
+ GCONF_CLIENT_PRELOAD_RECURSIVE,
+ NULL);
+
+ gconf_client_notify_add(gconf_client,
+ "/desktop/gnome",
+ gconf_key_changed_callback,
+ NULL , /* UserData */
+ NULL,
+ NULL);
+
+ gconf_client_add_dir(gconf_client,
"/apps/matchbox",
/* GCONF_CLIENT_PRELOAD_NONE */
GCONF_CLIENT_PRELOAD_RECURSIVE,