gnome-desktop r5315 - in trunk/libgnome-desktop: . libgnomeui

[federico svn gnome org]

Author: federico
Date: Thu Dec  4 00:29:48 2008
New Revision: 5315
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5315&view=rev

Log:
Report errors when no saved configuration matches the current configuration

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

Modified:
   trunk/libgnome-desktop/gnome-rr-config.c
   trunk/libgnome-desktop/libgnomeui/gnome-rr.h

Modified: trunk/libgnome-desktop/gnome-rr-config.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr-config.c	(original)
+++ trunk/libgnome-desktop/gnome-rr-config.c	Thu Dec  4 00:29:48 2008
@@ -1112,8 +1112,6 @@
     GnomeRRConfig **configs;
     GnomeRRConfig *result;
 
-    /* FMQ: return error */
-
     g_return_val_if_fail (screen != NULL, NULL);
     g_return_val_if_fail (error == NULL || *error == NULL, NULL);
     
@@ -1135,7 +1133,9 @@
 	    }
 	}
 
-	/* FMQ: what if result == NULL here?  Do we return an error? */
+	if (result == NULL)
+	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG,
+			 _("none of the saved display configurations matched the active configuration"));
 
 	configurations_free (configs);
     }

Modified: trunk/libgnome-desktop/libgnomeui/gnome-rr.h
==============================================================================
--- trunk/libgnome-desktop/libgnomeui/gnome-rr.h	(original)
+++ trunk/libgnome-desktop/libgnomeui/gnome-rr.h	Thu Dec  4 00:29:48 2008
@@ -60,6 +60,7 @@
     GNOME_RR_ERROR_RANDR_ERROR,		/* generic/undescribed error from the underlying XRR API */
     GNOME_RR_ERROR_BOUNDS_ERROR,	/* requested bounds of a CRTC are outside the maximum size */
     GNOME_RR_ERROR_CRTC_ASSIGNMENT,	/* could not assign CRTCs to outputs */
+    GNOME_RR_ERROR_NO_MATCHING_CONFIG,	/* none of the saved configurations matched the current configuration */
 } GnomeRRError;
 
 /* GnomeRRScreen */