From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 2 May 2007 20:22:36 +0000 (+0000)
Subject: merge the incredibly important revisions 5984,5985 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~199
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=48c06f7b30e80e3710bf4eaf6a776446a55bdd17;p=dana%2Fopenbox.git

merge the incredibly important revisions 5984,5985 from trunk
---

diff --git a/openbox/event.c b/openbox/event.c
index a36e9223..c00212f8 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1365,7 +1365,9 @@ static gboolean event_handle_menu(XEvent *ev)
 
     switch (ev->type) {
     case ButtonRelease:
-        if (ev->xbutton.button <= 3 && menu_can_hide) {
+        if ((ev->xbutton.button < 4 || ev->xbutton.button > 5)
+            && menu_can_hide)
+        {
             if ((e = menu_entry_frame_under(ev->xbutton.x_root,
                                             ev->xbutton.y_root)))
                 menu_entry_frame_execute(e, ev->xbutton.state,