diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | settings-daemon.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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); |