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

[federico svn gnome org]

Author: federico
Date: Tue Jan 27 21:34:44 2009
New Revision: 678
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=678&view=rev

Log:
bgo545115 (RANDR) - Handle the case where there is no matching configuration at startup; this is not an error

	Handle the case where there is no matching configuration at
	startup; this is not an error:

	* plugins/xrandr/gsd-xrandr-manager.c
	(apply_intended_configuration): "no matching configuration" is not
	an error when looking for a suitable configuration in
	monitors.xml; it simply means that the user has a different set of
	monitors than the ones that are available in that file.

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	Tue Jan 27 21:34:44 2009
@@ -1293,7 +1293,12 @@
         my_error = NULL;
         if (!gnome_rr_config_apply_stored (manager->priv->rw_screen, intended_filename, &my_error)) {
                 if (my_error) {
-                        if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+                        if (g_error_matches (my_error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG)) {
+                                /* This is not an error; the user probably
+                                 * changed his monitors and then logged in
+                                 * again, thus restarting gnome-settings-daemon.
+                                 */
+                        } else 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);