aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorross <ross@b067294f-1dea-0310-9683-c47a78595994>2007-11-16 15:08:58 +0000
committerross <ross@b067294f-1dea-0310-9683-c47a78595994>2007-11-16 15:08:58 +0000
commite72bd546c1275d55a49591da4b997b69544b84ce (patch)
tree4a5d4df69a1e4f02fbb7a115299b08728c1452d4
parent5b5512e3aa8c6f3b8456a646c3c4ee42fa99cd20 (diff)
downloadxsettings-daemon-e72bd546c1275d55a49591da4b997b69544b84ce.tar.gz
xsettings-daemon-e72bd546c1275d55a49591da4b997b69544b84ce.tar.bz2
xsettings-daemon-e72bd546c1275d55a49591da4b997b69544b84ce.zip
2007-11-16 Ross Burton <ross@openedhand.com>
* settings-daemon.c: Pass -nocpp to xrdb, as cpp isn't really used on devices. Hell, maybe this entire chunk of code should die. git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/settings-daemon@1825 b067294f-1dea-0310-9683-c47a78595994
-rw-r--r--ChangeLog6
-rw-r--r--settings-daemon.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 49a50d7..d38e308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-16 Ross Burton <ross@openedhand.com>
+
+ * settings-daemon.c:
+ Pass -nocpp to xrdb, as cpp isn't really used on devices. Hell,
+ maybe this entire chunk of code should die.
+
2007-10-17 Thomas Wood <thomas@openedhand.com>
* settings-daemon.c: Add support for gtk-color-scheme setting
diff --git a/settings-daemon.c b/settings-daemon.c
index 9c7fc9e..d489186 100644
--- a/settings-daemon.c
+++ b/settings-daemon.c
@@ -522,7 +522,7 @@ sd_spawn_with_input (char **argv,
static void
sd_xft_settings_set_xresources (SdXftSettings *settings)
{
- const char *add[] = { "xrdb", "-merge", NULL };
+ const char *add[] = { "xrdb", "-merge", "-nocpp", NULL };
GString *add_string;
g_return_if_fail (settings != NULL);