memory leak

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index 8f210b0c6dc745edd19942e65edc703fef722f40..7be63d53307c403f5a5672396f01aa6b4d011cd1 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -145,16 +145,12 @@ struct _ObFrame
     gboolean  flash_on;
     GTimeVal  flash_end;
 
-    /*! The step which the client is currently in for animating iconify and
-      restore.
-      0 means that it is not animating. FRAME_ANIMATE_ICONIFY_STEPS is the
-      first step for iconifying, and -FRAME_ANIMATE_ICONIFY_STEPS is the
-      forst step for restoring. It counts towards 0 either way. Visually,
-      +x == -(FRAME_ANIMATE_ICONIFY_STEPS-x+1)
+    /*! Is the frame currently in an animation for iconify or restore.
+      0 means that it is not animating. > 0 means it is animating an iconify.
+      < 0 means it is animating a restore.
     */
-    gint iconify_animation_step;
-    ObFrameIconifyAnimateFunc iconify_animation_cb;
-    gpointer iconify_animation_data;
+    gint iconify_animation_going;
+    GTimeVal  iconify_animation_end;
 };
 
 ObFrame *frame_new(struct _ObClient *c);
@@ -194,8 +190,9 @@ void frame_flash_stop(ObFrame *self);
 /*! Start an animation for iconifying or restoring a frame. The callback
   will be called when the animation finishes. But if another animation is
   started in the meantime, the callback will never get called. */
-void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying,
-                                   ObFrameIconifyAnimateFunc callback,
-                                   gpointer data);
+void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying);
+void frame_end_iconify_animation(ObFrame *self);
+
+#define frame_iconify_animating(f) (f->iconify_animation_going != 0)
 
 #endif