From: Dana Jansens <danakj@orodu.net>
Date: Sat, 5 May 2007 13:12:04 +0000 (+0000)
Subject: dont make two animations conflict
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=9ee9b70757668148701f6458a977c9f1229e6e70;p=chaz%2Fopenbox

dont make two animations conflict
---

diff --git a/openbox/frame.c b/openbox/frame.c
index 38bbde18..3d21c2b0 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -601,7 +601,8 @@ void frame_release_client(ObFrame *self, ObClient *client)
     g_assert(self->client == client);
 
     /* if there was any animation going on, kill it */
-    ob_main_loop_timeout_remove(ob_main_loop, frame_animate_iconify);
+    ob_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify,
+                                     self, FALSE);
 
     /* check if the app has already reparented its window away */
     while (XCheckTypedWindowEvent(ob_display, client->window,
@@ -1120,7 +1121,8 @@ void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying,
     if (self->iconify_animation_step == FRAME_ANIMATE_ICONIFY_STEPS ||
         self->iconify_animation_step == -FRAME_ANIMATE_ICONIFY_STEPS)
     {
-        ob_main_loop_timeout_remove(ob_main_loop, frame_animate_iconify);
+        ob_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify,
+                                         self, FALSE);
         ob_main_loop_timeout_add(ob_main_loop,
                                  FRAME_ANIMATE_ICONIFY_TIME /
                                  FRAME_ANIMATE_ICONIFY_STEPS,