diff options
| author | Federico Mena Quintero <federico@novell.com> | 2008-12-04 00:29:48 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2008-12-04 00:29:48 +0000 |
| commit | 1023b3cec9d566101d6c0fac2edf6911cb2b9fbd (patch) | |
| tree | 27ca6854cbc0600439a9ed93ac9914476e4c0c34 | |
| parent | 03a3d6cc6899bd8feb090f900d9657e8cf13b9c6 (diff) | |
| download | gnome-desktop-1023b3cec9d566101d6c0fac2edf6911cb2b9fbd.tar.gz | |
Report errors when no saved configuration matches the current configuration
Signed-off-by: Federico Mena Quintero <federico@novell.com>
svn path=/trunk/; revision=5315
| -rw-r--r-- | libgnome-desktop/gnome-rr-config.c | 6 | ||||
| -rw-r--r-- | libgnome-desktop/libgnomeui/gnome-rr.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c index 66c231de..df926ba3 100644 --- a/libgnome-desktop/gnome-rr-config.c +++ b/libgnome-desktop/gnome-rr-config.c @@ -1112,8 +1112,6 @@ gnome_rr_config_new_stored (GnomeRRScreen *screen, GError **error) 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 @@ gnome_rr_config_new_stored (GnomeRRScreen *screen, GError **error) } } - /* 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); } diff --git a/libgnome-desktop/libgnomeui/gnome-rr.h b/libgnome-desktop/libgnomeui/gnome-rr.h index 5daa02ab..38b1af86 100644 --- a/libgnome-desktop/libgnomeui/gnome-rr.h +++ b/libgnome-desktop/libgnomeui/gnome-rr.h @@ -60,6 +60,7 @@ typedef enum { 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 */ |