gnome-settings-daemon r661 - in trunk: . plugins/xrandr

[federico svn gnome org]

Author: federico
Date: Thu Jan 15 02:53:11 2009
New Revision: 661
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=661&view=rev

Log:
bnc465968 - Lack of a stored RANDR configuration is not an error when the daemon starts up
2009-01-14  Federico Mena Quintero  <federico novell com>

	* plugins/xrandr/gsd-xrandr-manager.c (gsd_xrandr_manager_start):
	If there was no file with a stored configuration, don't pop up an
	error message --- this is not an error when the daemon starts up.
	Fixes https://bugzilla.novell.com/show_bug.cgi?id=465968

Signed-off-by: Federico Mena Quintero <federico novell com>

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

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Thu Jan 15 02:53:11 2009
@@ -1165,9 +1165,10 @@
 
         my_error = NULL;
         if (!gnome_rr_config_apply_stored (manager->priv->rw_screen, &my_error)) {
-                /* my_error can be null if there were no stored configurations */
                 if (my_error) {
-                        error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL);
+                        if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+                                error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL);
+
                         g_error_free (my_error);
                 }
         }