diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | settings-daemon.c | 6 |
3 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2008-06-16 Ross Burton <ross@openedhand.com> + + * configure.ac: + * settings-daemon.c: + Add --with-xrdb to enable use of xrdb to set Xft properties. + Disable it by default. + 2008-04-08 Thomas Wood <thomas@openedhand.com> * settings-daemon.c: (main): Fork only after settings have been applied diff --git a/configure.ac b/configure.ac index afed992..99ba9f3 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,13 @@ if test x"$GCONFTOOL" = xno; then fi AM_GCONF_SOURCE_2 +AC_MSG_CHECKING([whether to use xrdb to set Xft settings]) +AC_ARG_WITH([xrdb], + [AS_HELP_STRING([--with-xrdb], + [use xrdb [default=no]])], + [],[with_xrdb=no]) +AS_IF([test "$with_xrdb" = "yes"], [AC_DEFINE(WITH_XRDB, 1, [Use xrdb])]) +AC_MSG_RESULT([$with_xrdb]) # Checks for header files. @@ -39,6 +46,5 @@ AC_C_CONST AC_TYPE_PID_T -# Checks for library functions. AC_OUTPUT([Makefile]) diff --git a/settings-daemon.c b/settings-daemon.c index 791ac17..7dce4b8 100644 --- a/settings-daemon.c +++ b/settings-daemon.c @@ -25,6 +25,8 @@ * Authors: Owen Taylor, Havoc Pennington */ +#include <config.h> + #include <sys/types.h> #include <sys/wait.h> #include <signal.h> @@ -420,6 +422,7 @@ sd_xft_settings_set_xsettings (SdXftSettings *settings) } } +#if WITH_XRDB static gboolean write_all (int fd, const char *buf, @@ -547,6 +550,7 @@ sd_xft_settings_set_xresources (SdXftSettings *settings) g_string_free (add_string, TRUE); } +#endif /** * We mirror the Xft properties both through XSETTINGS and through X resources. @@ -559,7 +563,9 @@ sd_settings_update_xft (void) sd_xft_settings_get (gconf_client, &settings); sd_xft_settings_set_xsettings (&settings); +#if WITH_XRDB sd_xft_settings_set_xresources (&settings); +#endif } /** |