[gnome-settings-daemon] general: use gdk_error_trap_pop_ignored() when appropriate

[Cosimo Cecchi <cosimoc src gnome org>]

commit 544526d30acded821a83be41f4a850d055ad99bc
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Dec 23 19:39:34 2010 +0100

    general: use gdk_error_trap_pop_ignored() when appropriate

 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c |    6 +++---
 plugins/clipboard/gsd-clipboard-manager.c         |    6 +++---
 plugins/common/gsd-input-helper.c                 |    4 ++--
 plugins/keybindings/gsd-keybindings-manager.c     |    2 +-
 plugins/keyboard/gsd-keyboard-manager.c           |    2 +-
 plugins/media-keys/gsd-media-keys-manager.c       |    2 +-
 plugins/mouse/gsd-mouse-manager.c                 |    4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
index bfe7b2f..ab6b245 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
@@ -136,7 +136,7 @@ get_xkb_desc_rec (GsdA11yKeyboardManager *manager)
                 desc->ctrls = NULL;
                 status = XkbGetControls (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbAllControlsMask, desc);
         }
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 
         g_return_val_if_fail (desc != NULL, NULL);
         g_return_val_if_fail (desc->ctrls != NULL, NULL);
@@ -334,7 +334,7 @@ set_server_from_gsettings (GsdA11yKeyboardManager *manager)
         XkbFreeKeyboard (desc, XkbAllComponentsMask, True);
 
         XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 
         gnome_settings_profile_end (NULL);
 }
@@ -1007,7 +1007,7 @@ restore_server_xkb_config (GsdA11yKeyboardManager *manager)
                          XkbAllComponentsMask, True);
 
         XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 
         manager->priv->original_xkb_desc = NULL;
 }
diff --git a/plugins/clipboard/gsd-clipboard-manager.c b/plugins/clipboard/gsd-clipboard-manager.c
index 2e0c76e..bfa3f49 100644
--- a/plugins/clipboard/gsd-clipboard-manager.c
+++ b/plugins/clipboard/gsd-clipboard-manager.c
@@ -151,7 +151,7 @@ send_selection_notify (GsdClipboardManager *manager,
                     (XEvent *)&notify);
         XSync (manager->priv->display, False);
 
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 }
 
 static void
@@ -178,7 +178,7 @@ finish_selection_request (GsdClipboardManager *manager,
                     False, NoEventMask, (XEvent *) &notify);
         XSync (manager->priv->display, False);
 
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 }
 
 static int
@@ -554,7 +554,7 @@ convert_clipboard_target (IncrConversion      *rdata,
 
                         XSync (manager->priv->display, False);
 
-                        gdk_error_trap_pop ();
+                        gdk_error_trap_pop_ignored ();
                 }
         }
 }
diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
index ee56431..6f51e52 100644
--- a/plugins/common/gsd-input-helper.c
+++ b/plugins/common/gsd-input-helper.c
@@ -65,11 +65,11 @@ device_is_touchpad (XDeviceInfo deviceinfo)
         if ((XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device, prop, 0, 1, False,
                                 XA_INTEGER, &realtype, &realformat, &nitems,
                                 &bytes_after, &data) == Success) && (realtype != None)) {
-                gdk_error_trap_pop ();
+                gdk_error_trap_pop_ignored ();
                 XFree (data);
                 return device;
         }
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 
         XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
         return NULL;
diff --git a/plugins/keybindings/gsd-keybindings-manager.c b/plugins/keybindings/gsd-keybindings-manager.c
index a5f7007..6349ddf 100644
--- a/plugins/keybindings/gsd-keybindings-manager.c
+++ b/plugins/keybindings/gsd-keybindings-manager.c
@@ -315,7 +315,7 @@ binding_unregister_keys (GsdKeybindingsManager *manager)
 
         if (need_flush)
                 gdk_flush ();
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 }
 
 static void
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index bf70265..d2ecd8a 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -350,7 +350,7 @@ apply_settings (GSettings          *settings,
 #endif /* HAVE_X11_EXTENSIONS_XKB_H */
 
         XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 }
 
 void
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index f90b563..81f163a 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1375,7 +1375,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
 
         if (need_flush)
                 gdk_flush ();
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 
         if (priv->screens != NULL) {
                 g_slist_free (priv->screens);
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index b4df9eb..44df57f 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -288,7 +288,7 @@ touchpad_has_single_button (XDevice *device)
         if (rc == Success)
                 XFree (data);
 
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
 
         return is_single_button;
 }
@@ -539,7 +539,7 @@ set_middle_button (GsdMouseManager *manager,
                         XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                                                device, prop, type, format, PropModeReplace, data, nitems);
 
-                        gdk_error_trap_pop ();
+                        gdk_error_trap_pop_ignored ();
                 }
 
                 XFree (data);