[mutter] keybindings: Remove two extra error traps



commit 2c5391946273c0a931c6ce2e80ba60587674eef1
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Apr 24 10:56:59 2014 -0400

    keybindings: Remove two extra error traps

 src/core/keybindings.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 428b32a..d1cc4d0 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1383,7 +1383,6 @@ grab_keyboard (MetaDisplay *display,
                guint32      timestamp,
                int          grab_mode)
 {
-  int result;
   int grab_status;
 
   unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
@@ -1419,23 +1418,12 @@ grab_keyboard (MetaDisplay *display,
 
   if (grab_status != Success)
     {
-      meta_error_trap_pop_with_return (display);
       meta_topic (META_DEBUG_KEYBINDINGS,
                   "XIGrabDevice() returned failure status %s time %u\n",
                   grab_status_to_string (grab_status),
                   timestamp);
       return FALSE;
     }
-  else
-    {
-      result = meta_error_trap_pop_with_return (display);
-      if (result != Success)
-        {
-          meta_topic (META_DEBUG_KEYBINDINGS,
-                      "XIGrabDevice() resulted in an error\n");
-          return FALSE;
-        }
-    }
 
   meta_topic (META_DEBUG_KEYBINDINGS, "Grabbed all keys\n");
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]