From: Mikael Magnusson <mikachu@gmail.com>
Date: Sat, 4 Jul 2009 13:34:54 +0000 (+0200)
Subject: Give the popup to the timer remove so it does the right one
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=384f2dfc48278998631d3f9bac3a337d296b198e;p=chaz%2Fopenbox

Give the popup to the timer remove so it does the right one

Only the chroot popup uses delayed mapping so this is just a latent bug.
---

diff --git a/openbox/popup.c b/openbox/popup.c
index 770f33d0..2a0d5960 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -320,7 +320,7 @@ void popup_hide(ObPopup *self)
 
         event_end_ignore_all_enters(ignore_start);
     } else if (self->delay_mapped) {
-        ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
+        ob_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE);
         self->delay_mapped = FALSE;
     }
 }