gnome-desktop r5326 - trunk/libgnome-desktop

[vuntz svn gnome org]

Author: vuntz
Date: Wed Dec 10 01:43:34 2008
New Revision: 5326
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5326&view=rev

Log:
2008-12-10  Vincent Untz  <vuntz gnome org>

	* gnome-rr-config.c: (crtc_assignment_new):
	* gnome-rr.c: (gnome_rr_crtc_set_config):
	Fix build, thanks to Frederic Peters <fpeters 0d be> for the quick
	notice. Fix bug #563926 and bug #563927.


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

Modified: trunk/libgnome-desktop/gnome-rr-config.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr-config.c	(original)
+++ trunk/libgnome-desktop/gnome-rr-config.c	Wed Dec 10 01:43:34 2008
@@ -1552,7 +1552,7 @@
 			 width, height,
 			 min_width, min_height,
 			 max_width, max_height);
-	    goto epic_fail;
+	    goto fail;
 	}
 
 	assignment->screen = screen;

Modified: trunk/libgnome-desktop/gnome-rr.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr.c	(original)
+++ trunk/libgnome-desktop/gnome-rr.c	Wed Dec 10 01:43:34 2008
@@ -1109,7 +1109,7 @@
 			 (int) crtc->id,
 			 x, y,
 			 mode->width, mode->height,
-			 info->max_width, info->max-height);
+			 info->max_width, info->max_height);
 	    return FALSE;
 	}
     }