brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keybindings: Remove two extra error traps

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-24 10:56:59 -04:00
parent a6f3534ff0
commit 2c53919462
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/keybindings.c
View File

@ -1383,7 +1383,6 @@ grab_keyboard (MetaDisplay *display,
guint32 timestamp, guint32 timestamp,
int grab_mode) int grab_mode)
{ {
int result;
int grab_status; int grab_status;
unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 }; unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
@ -1419,23 +1418,12 @@ grab_keyboard (MetaDisplay *display,
if (grab_status != Success) if (grab_status != Success)
{ {
meta_error_trap_pop_with_return (display);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"XIGrabDevice() returned failure status %s time %u\n", "XIGrabDevice() returned failure status %s time %u\n",
grab_status_to_string (grab_status), grab_status_to_string (grab_status),
timestamp); timestamp);
return FALSE; 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"); meta_topic (META_DEBUG_KEYBINDINGS, "Grabbed all keys\n");