[gnome-settings-daemon/gnome-3-10] mouse: wrap device button mapping into gdk_error_trap_push/pop

[Rui Matos <rtcm src gnome org>]

commit 62e07927a6a75201b84c8872b14e51a599511a52
Author: Peter Hutterer <peter hutterer who-t net>
Date:   Thu Feb 20 17:19:02 2014 +1000

    mouse: wrap device button mapping into gdk_error_trap_push/pop
    
    The device may have disappeared by the time we get here, so make sure we catch
    BadDevice errors as well by moving the error trap push up before the first X
    call.

 plugins/mouse/gsd-mouse-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index e86c709..1f1d79b 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -349,6 +349,8 @@ set_left_handed (GsdMouseManager *manager,
                 left_handed = mouse_left_handed;
         }
 
+        gdk_error_trap_push ();
+
         n_buttons = XGetDeviceButtonMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice,
                                              buttons,
                                              buttons_capacity);
@@ -365,7 +367,6 @@ set_left_handed (GsdMouseManager *manager,
 
         configure_button_layout (buttons, n_buttons, left_handed);
 
-       gdk_error_trap_push ();
         XSetDeviceButtonMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, buttons, 
n_buttons);
         gdk_error_trap_pop_ignored ();