[PATCH] use xrdb -nocpp when possible

[Rodrigo Moya <rodrigo novell com>]

Hi

Attached patch makes xrdb use the -nocpp option when possible, in 2 of
the 3 executions, where we are just passing built input, with no
#define's at all, to xrdb.

That makes my session start in 12 seconds, better than the 14/15 I was
getting before the change, but still far ahead of the 6/7 I was getting
when not running xrdb at all (and with other things in
gnome-session/g-s-d commented out).

gdm itself runs xrdb for the ~/.Xresources file, so, not sure if we can
remove that file from gnome-settings-xrdb.c.

I was planning to execute the xrdb thing in g-s-xrdb.c in a timeout, but
from what was said in d-d-l, we really need to execute xrdb before any
motif app is started. Any comments?
-- 
Rodrigo Moya <rodrigo novell com>

? org.gnome.SettingsDaemon.desktop-service
? org.gnome.SettingsDaemon.service
? org.gnome.SettingsDaemon.service.in
? performance-patch.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/ChangeLog,v
retrieving revision 1.195
diff -u -p -r1.195 ChangeLog
--- ChangeLog	17 Oct 2005 14:53:19 -0000	1.195
+++ ChangeLog	18 Oct 2005 11:07:15 -0000
@@ -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.
Index: gnome-settings-font.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-font.c,v
retrieving revision 1.9
diff -u -p -r1.9 gnome-settings-font.c
--- gnome-settings-font.c	16 Sep 2005 17:25:15 -0000	1.9
+++ gnome-settings-font.c	18 Oct 2005 11:07:15 -0000
@@ -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,
Index: gnome-settings-xsettings.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-xsettings.c,v
retrieving revision 1.31
diff -u -p -r1.31 gnome-settings-xsettings.c
--- gnome-settings-xsettings.c	17 Oct 2005 14:53:19 -0000	1.31
+++ gnome-settings-xsettings.c	18 Oct 2005 11:07:15 -0000
@@ -382,7 +382,7 @@ gnome_xft_settings_set_xsettings (GnomeX
 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));