summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2008-12-10 01:43:34 +0000
committerVincent Untz <vuntz@src.gnome.org>2008-12-10 01:43:34 +0000
commit9300fa95e2d425b382d7a2b95780aef57774b8fb (patch)
tree8dc282e34e724a99b4eceba1c3b5f386341c3b77
parent1bd923fcc49f5b026b5fee384d1626cd0022cdab (diff)
downloadgnome-desktop-9300fa95e2d425b382d7a2b95780aef57774b8fb.tar.gz
Fix build, thanks to Frederic Peters <fpeters@0d.be> for the quick notice.
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. svn path=/trunk/; revision=5326
-rw-r--r--libgnome-desktop/ChangeLog7
-rw-r--r--libgnome-desktop/gnome-rr-config.c2
-rw-r--r--libgnome-desktop/gnome-rr.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/libgnome-desktop/ChangeLog b/libgnome-desktop/ChangeLog
index d7cb1eb1..d81eb27a 100644
--- a/libgnome-desktop/ChangeLog
+++ b/libgnome-desktop/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2008-12-09 Federico Mena Quintero <federico@novell.com>
Fix http://bugzilla.gnome.org/show_bug.cgi?id=563831
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
index 3497e175..dfa7c66a 100644
--- a/libgnome-desktop/gnome-rr-config.c
+++ b/libgnome-desktop/gnome-rr-config.c
@@ -1552,7 +1552,7 @@ crtc_assignment_new (GnomeRRScreen *screen, GnomeOutputInfo **outputs, GError **
width, height,
min_width, min_height,
max_width, max_height);
- goto epic_fail;
+ goto fail;
}
assignment->screen = screen;
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index a1908ba2..17f3841c 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -1109,7 +1109,7 @@ gnome_rr_crtc_set_config (GnomeRRCrtc *crtc,
(int) crtc->id,
x, y,
mode->width, mode->height,
- info->max_width, info->max-height);
+ info->max_width, info->max_height);
return FALSE;
}
}