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

[federico svn gnome org]

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

Log:
Fix prototypes; report errors from gnome_rr_config_applicable()

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

Modified:
   trunk/libgnome-desktop/gnome-rr-config.c
   trunk/libgnome-desktop/libgnomeui/gnome-rr-config.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:30:14 2008
@@ -885,12 +885,19 @@
 
 gboolean
 gnome_rr_config_applicable (GnomeRRConfig  *configuration,
-			  GnomeRRScreen       *screen)
+			    GnomeRRScreen  *screen,
+			    GError        **error)
 {
-    GnomeOutputInfo **outputs = make_outputs (configuration);
-    CrtcAssignment *assign = crtc_assignment_new (screen, outputs);
+    GnomeOutputInfo **outputs;
+    CrtcAssignment *assign;
     gboolean result;
 
+    g_return_val_if_fail (configuration != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    outputs = make_outputs (configuration);
+    assign = crtc_assignment_new (screen, outputs, error);
+
     if (assign)
     {
 	result = TRUE;

Modified: trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h
==============================================================================
--- trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h	(original)
+++ trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h	Thu Dec  4 00:30:14 2008
@@ -84,11 +84,13 @@
 					      GError        **err);
 void            gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
 gboolean	gnome_rr_config_apply        (GnomeRRConfig  *configuration,
-					      GnomeRRScreen  *screen);
+					      GnomeRRScreen  *screen,
+					      GError        **error);
 gboolean        gnome_rr_config_apply_stored (GnomeRRScreen  *screen,
 					      GError        **error);
 gboolean        gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
-					      GnomeRRScreen  *screen);
+					      GnomeRRScreen  *screen,
+					      GError        **error);
 
 /* A utility function that isn't really in the spirit of this file, but I don't
  * don't know a better place for it.