gnome-settings-daemon r651 - in trunk: . plugins/xrdb

[hadess svn gnome org]

Author: hadess
Date: Mon Jan  5 12:28:57 2009
New Revision: 651
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=651&view=rev

Log:
2009-01-05  Bastien Nocera  <hadess hadess net>

	* plugins/xrdb/gsd-xrdb-manager.c (apply_settings): Quiet xrdb
	when there are duplicate rules in the .ad files (Closes: #566610)



Modified:
   trunk/ChangeLog
   trunk/plugins/xrdb/gsd-xrdb-manager.c

Modified: trunk/plugins/xrdb/gsd-xrdb-manager.c
==============================================================================
--- trunk/plugins/xrdb/gsd-xrdb-manager.c	(original)
+++ trunk/plugins/xrdb/gsd-xrdb-manager.c	Mon Jan  5 12:28:57 2009
@@ -432,7 +432,7 @@
 
         gnome_settings_profile_start (NULL);
 
-        command = "xrdb -merge";
+        command = "xrdb -merge -quiet";
 
         string = g_string_sized_new (256);
         append_theme_colors (style, string);