[gnome-settings-daemon] (randr) bnc#647304 - If the stored configuration fails at startup, use the fallback configurations

[Federico Mena Quintero <federico src gnome org>]

commit 51ac14b4a8b3e36746fec0b07947036b9c3a2e4a
Author: Gary Lin <glin novell com>
Date:   Fri Oct 29 12:31:07 2010 -0500

    (randr) bnc#647304 - If the stored configuration fails at startup, use the fallback configurations
    
    Previously, if a stored configuration existed but it could not be applied due
    to nonmatching monitors, we would do nothing else - potentially leaving the user
    in whatever startup state was used by the X server.  Now, in that condition
    we simply fall back to trying the system-global configuration or the boot-time
    configuration.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 plugins/xrandr/gsd-xrandr-manager.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 7b31c60..b0c4cc8 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -1597,10 +1597,11 @@ apply_intended_configuration (GsdXrandrManager *manager, const char *intended_fi
         gboolean result;
 
         my_error = NULL;
-        result = apply_configuration_from_filename (manager, intended_filename, FALSE, timestamp, &my_error);
+        result = apply_configuration_from_filename (manager, intended_filename, TRUE, timestamp, &my_error);
         if (!result) {
                 if (my_error) {
-                        if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
+                        if (!g_error_matches (my_error, G_FILE_ERROR, G_FILE_ERROR_NOENT) &&
+                            !g_error_matches (my_error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG))
                                 error_message (manager, _("Could not apply the stored configuration for monitors"), my_error, NULL);
 
                         g_error_free (my_error);