diff options
author | Danny Baumann <dannybaumann@web.de> | 2009-02-04 08:08:10 +0100 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2009-02-04 08:48:00 +0100 |
commit | 052a21f8455673f8b3c2919579065cff32efc441 (patch) | |
tree | 3734dd8f54c32dc080522ffa7248613dd5c0a098 | |
parent | 674a2163d1f5393911ba610ff9e7646877e5c34d (diff) |
Fix panel actions not being executed properly.
-rw-r--r-- | plugins/gnomecompat.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/gnomecompat.c b/plugins/gnomecompat.c index 3fdda9bd..d8659d11 100644 --- a/plugins/gnomecompat.c +++ b/plugins/gnomecompat.c @@ -90,13 +90,17 @@ panelAction (CompDisplay *d, GNOME_DISPLAY (d); - xid = getIntOptionNamed (option, nOption, "window", 0); + xid = getIntOptionNamed (option, nOption, "root", 0); s = findScreenAtDisplay (d, xid); if (!s) return; - time = getIntOptionNamed (option, nOption, "time", 0); + time = getIntOptionNamed (option, nOption, "time", CurrentTime); + + /* we need to ungrab the keyboard here, otherwise the panel main + menu won't popup as it wants to grab the keyboard itself */ + XUngrabKeyboard (d->display, time); event.type = ClientMessage; event.xclient.window = s->root; @@ -140,7 +144,7 @@ showRunDialog (CompDisplay *d, } static const CompMetadataOptionInfo gnomeDisplayOptionInfo[] = { { "main_menu_key", "key", 0, showMainMenu, 0 }, - { "run_dialog_key", "key", 0, showRunDialog, 0 }, + { "run_key", "key", 0, showRunDialog, 0 }, { "command_screenshot", "string", 0, 0, 0 }, { "run_command_screenshot_key", "key", 0, runDispatch, 0 }, { "command_window_screenshot", "string", 0, 0, 0 }, |