diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-18 20:43:18 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-18 20:43:18 -0500 |
| commit | 3263845459d15da683b7cab92fb856acbdf2800e (patch) | |
| tree | 15bc390602a83a0f919e8a1faa7f8a20c8a4f542 /openbox/grab.c | |
| parent | 9e05faf3d6ac1c527032efb7210de8bbfeb2212c (diff) | |
| parent | 041d17373e046b5ee6667b10c1492bb518bac097 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/grab.c
openbox/keyboard.c
Diffstat (limited to 'openbox/grab.c')
| -rw-r--r-- | openbox/grab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbox/grab.c b/openbox/grab.c index 522fbf96..e797e44c 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -221,7 +221,7 @@ void ungrab_passive_key(void) { /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/ if (passive_count) { - /* kill out passive grab */ + /* kill our passive grab */ XUngrabKeyboard(obt_display, event_curtime); passive_count = 0; } |