2005-10-18 Rodrigo Moya <rodrigo@novell.com><>

* gnome-settings-font.c (load_xcursor_theme):
	* gnome-settings-xsettings.c (gnome_xft_settings_set_xsettings):
	run xrdb with -nocpp, since it's not needed here.
This commit is contained in:
Rodrigo Moya 2005-10-18 14:25:26 +00:00
parent bdf94c17e1
commit 845d328106
3 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2005-10-18 Rodrigo Moya <rodrigo@novell.com><>
* gnome-settings-font.c (load_xcursor_theme):
* gnome-settings-xsettings.c (gnome_xft_settings_set_xsettings):
run xrdb with -nocpp, since it's not needed here.
2005-10-16 Rodrigo Moya <rodrigo@novell.com>
* factory.c: declare a global GConfClient.

View file

@ -20,7 +20,7 @@ load_xcursor_theme (GConfClient *client)
{
gchar *cursor_theme;
gint size;
char *add[] = { "xrdb", "-merge", NULL };
char *add[] = { "xrdb", "-nocpp", "-merge", NULL };
GString *add_string = g_string_new (NULL);
cursor_theme = gconf_client_get_string (client,

View file

@ -382,7 +382,7 @@ gnome_xft_settings_set_xsettings (GnomeXftSettings *settings)
static void
gnome_xft_settings_set_xresources (GnomeXftSettings *settings)
{
char *add[] = { "xrdb", "-merge", NULL };
char *add[] = { "xrdb", "-nocpp", "-merge", NULL };
GString *add_string = g_string_new (NULL);
char *old_locale = g_strdup (setlocale (LC_NUMERIC, NULL));