[gnome-settings-daemon] Media keys: Avoid error trap when unnecessary

[Matthias Clasen <matthiasc src gnome org>]

commit 55f98f48a9ac05e941fc0dc623ae8ec16afea75f
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 20 09:10:17 2012 -0500

    Media keys: Avoid error trap when unnecessary
    
    Only push an error trap if we actually make failing X calls.

 plugins/media-keys/gsd-media-keys-manager.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 61e3a56..e4052f3 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2207,9 +2207,8 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
                 priv->connection = NULL;
         }
 
-        gdk_error_trap_push ();
-
         if (priv->keys != NULL) {
+                gdk_error_trap_push ();
                 for (i = 0; i < priv->keys->len; ++i) {
                         MediaKey *key;
 
@@ -2220,10 +2219,10 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
                 }
                 g_ptr_array_free (priv->keys, TRUE);
                 priv->keys = NULL;
-        }
 
-        gdk_flush ();
-        gdk_error_trap_pop_ignored ();
+                gdk_flush ();
+                gdk_error_trap_pop_ignored ();
+        }
 
         if (priv->screens != NULL) {
                 g_slist_free (priv->screens);