[gnome-desktop/gnome-3-8] gnome-rr: Ignore if setting the primary output fails

[Bastien Nocera <hadess src gnome org>]

commit ed7a16053e7e0b78dae9fcb213ba7857dba89b2e
Author: Alberto Milone <alberto milone canonical com>
Date:   Tue Dec 3 15:48:04 2013 +0100

    gnome-rr: Ignore if setting the primary output fails
    
    We already trap and ignore the error when detecting the primary
    output, so, according to the same logic, we should do the same
    when trying to set the primary output.
    
    This helps with drivers such as modesetting that do not play
    well with primary outputs (LP: #1224254).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=719784

 libgnome-desktop/gnome-rr.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index 5ae52b2..09e44cd 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -2148,8 +2148,11 @@ gnome_rr_screen_set_primary_output (GnomeRRScreen *screen,
     else
         id = None;
 
-    if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv))
+    if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv)) {
+        gdk_error_trap_push ();
         XRRSetOutputPrimary (priv->xdisplay, priv->xroot, id);
+        gdk_error_trap_pop_ignored ();
+    }
 }
 
 /* GnomeRRCrtc */