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

[federico svn gnome org]

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

Log:
Report errors from gnome_rr_screen_refresh()

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

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

Modified: trunk/libgnome-desktop/gnome-rr.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr.c	(original)
+++ trunk/libgnome-desktop/gnome-rr.c	Thu Dec  4 00:27:33 2008
@@ -469,14 +469,14 @@
 }
 
 static gboolean
-screen_update (GnomeRRScreen *screen, gboolean force_callback)
+screen_update (GnomeRRScreen *screen, gboolean force_callback, GError **error)
 {
     ScreenInfo *info;
     gboolean changed = FALSE;
     
     g_assert (screen != NULL);
 
-    info = screen_info_new (screen);    /* FMQ: do we need to return an error here? */
+    info = screen_info_new (screen, error);
     if (info)
     {
 	if (info->resources->configTimestamp != screen->info->resources->configTimestamp)
@@ -514,7 +514,7 @@
 	/* FIXME: we may need to be more discriminating in
 	 * what causes 'changed' events
 	 */
-	screen_update (screen, TRUE);
+	screen_update (screen, TRUE, NULL); /* NULL-GError */
     }
     
     /* Pass the event on to GTK+ */
@@ -630,9 +630,11 @@
 }
 
 gboolean
-gnome_rr_screen_refresh (GnomeRRScreen *screen)
+gnome_rr_screen_refresh (GnomeRRScreen *screen,
+			 GError       **error)
 {
-    return screen_update (screen, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+    return screen_update (screen, FALSE, error);
 }
 
 GnomeRRMode **

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:27:33 2008
@@ -77,7 +77,8 @@
 						    int                    mm_height);
 GnomeRRCrtc *   gnome_rr_screen_get_crtc_by_id     (GnomeRRScreen         *screen,
 						    guint32                id);
-gboolean        gnome_rr_screen_refresh            (GnomeRRScreen         *screen);
+gboolean        gnome_rr_screen_refresh            (GnomeRRScreen         *screen,
+						    GError               **error);
 GnomeRROutput * gnome_rr_screen_get_output_by_id   (GnomeRRScreen         *screen,
 						    guint32                id);
 GnomeRROutput * gnome_rr_screen_get_output_by_name (GnomeRRScreen         *screen,