[gnome-settings-daemon/gnome-3-10] mouse: wrap pointer acceleration changes into a gdk_error_trap

[Rui Matos <rtcm src gnome org>]

commit c90bbfcce1fd58ada6b945ec84e1de7b63438c01
Author: Peter Hutterer <peter hutterer who-t net>
Date:   Thu Feb 20 17:20:32 2014 +1000

    mouse: wrap pointer acceleration changes into a gdk_error_trap

 plugins/mouse/gsd-mouse-manager.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 1f1d79b..6623c90 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -431,6 +431,8 @@ set_motion (GsdMouseManager *manager,
         /* And threshold */
         motion_threshold = g_settings_get_int (settings, KEY_MOTION_THRESHOLD);
 
+        gdk_error_trap_push ();
+
         /* Get the list of feedbacks for the device */
         states = XGetFeedbackControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xdevice, 
&num_feedbacks);
         if (states == NULL)
@@ -459,6 +461,9 @@ set_motion (GsdMouseManager *manager,
                 state = (XFeedbackState *) ((char *) state + state->length);
         }
 
+        if (gdk_error_trap_pop ())
+                g_warning ("Error setting acceleration on \"%s\"", gdk_device_get_name (device));
+
         XFreeFeedbackList (states);
 
     out: