aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorross <ross@b067294f-1dea-0310-9683-c47a78595994>2008-06-16 16:19:42 +0000
committerross <ross@b067294f-1dea-0310-9683-c47a78595994>2008-06-16 16:19:42 +0000
commit0f174f463dfed500b65533e249cd22942e439c77 (patch)
tree4d473fee420bff0a33cfe054524580b099b17bd8
parentec1f13213d985e5f931387bbb9f8b0bea0cab1d0 (diff)
downloadxsettings-daemon-0f174f463dfed500b65533e249cd22942e439c77.tar.gz
xsettings-daemon-0f174f463dfed500b65533e249cd22942e439c77.tar.bz2
xsettings-daemon-0f174f463dfed500b65533e249cd22942e439c77.zip
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. git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/settings-daemon@2059 b067294f-1dea-0310-9683-c47a78595994
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac8
-rw-r--r--settings-daemon.c6
3 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a3b850..4f2a0fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
}
/**