r22370 - in /desktop/unstable/gnome-desktop/debian: changelog patches/01_check_xrandr_version.patch patches/01_trap_rr_x_errors.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Nov 18 11:58:55 2009
New Revision: 22370

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22370
Log:
* 01_trap_rr_x_errors.patch: dropped, this solution is fugly.
* 01_check_xrandr_version.patch: check that the extension is available 
  at version 1.2 before running code that requires version 1.2 anyway.

Added:
    desktop/unstable/gnome-desktop/debian/patches/01_check_xrandr_version.patch
Removed:
    desktop/unstable/gnome-desktop/debian/patches/01_trap_rr_x_errors.patch
Modified:
    desktop/unstable/gnome-desktop/debian/changelog

Modified: desktop/unstable/gnome-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/changelog?rev=22370&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/changelog [utf-8] Wed Nov 18 11:58:55 2009
@@ -1,3 +1,11 @@
+gnome-desktop (2.28.1-3) UNRELEASED; urgency=low
+
+  * 01_trap_rr_x_errors.patch: dropped, this solution is fugly.
+  * 01_check_xrandr_version.patch: check that the extension is available 
+    at version 1.2 before running code that requires version 1.2 anyway.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 18 Nov 2009 12:57:01 +0100
+
 gnome-desktop (2.28.1-2) unstable; urgency=low
 
   * Switch to python-support.

Added: desktop/unstable/gnome-desktop/debian/patches/01_check_xrandr_version.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/patches/01_check_xrandr_version.patch?rev=22370&op=file
==============================================================================
--- desktop/unstable/gnome-desktop/debian/patches/01_check_xrandr_version.patch (added)
+++ desktop/unstable/gnome-desktop/debian/patches/01_check_xrandr_version.patch [utf-8] Wed Nov 18 11:58:55 2009
@@ -1,0 +1,20 @@
+Debian #556797
+LP #454487
+GNOME #600188
+
+--- libgnome-desktop/gnome-rr.c.orig	2009-11-18 12:39:32.274397008 +0100
++++ libgnome-desktop/gnome-rr.c	2009-11-18 12:53:22.690898043 +0100
+@@ -630,6 +630,13 @@
+ 
+ 	XRRQueryVersion (dpy, &screen->rr_major_version, &screen->rr_minor_version);
+ 
++	if (screen->rr_major_version != 1 || screen->rr_minor_version < 2) {
++	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_RANDR_EXTENSION,
++		         _("RANDR extension version 1.2 or later is not present"));
++	    g_free (screen);
++	    return NULL;
++	}
++
+ 	screen->info = screen_info_new (screen, TRUE, error);
+ 	
+ 	if (!screen->info) {