Since bouncing respects DisableAnimations option, there's no need
in #ifdef's.

Acked-by: Carlos R. Mafra <[email protected]>
Signed-off-by: Alexey I. Froloff <[email protected]>
---
 src/application.c |    2 --
 src/application.h |    2 --
 src/superfluous.c |    8 --------
 src/wconfig.h.in  |    3 ---
 4 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/src/application.c b/src/application.c
index 21155c7..1415efa 100644
--- a/src/application.c
+++ b/src/application.c
@@ -409,14 +409,12 @@ void wApplicationDestroy(WApplication * wapp)
        if (wapp->refcount > 0)
                return;
 
-#ifdef BOUNCE_APP
        if (wapp->flags.bouncing) {
                /* event.c:handleDestroyNotify forced this destroy
                   and thereby overlooked the bounce callback */
                wapp->refcount = 1;
                return;
        }
-#endif
 
        scr = wapp->main_window_desc->screen_ptr;
        main_window = wapp->main_window;
diff --git a/src/application.h b/src/application.h
index 111491d..5eeefef 100644
--- a/src/application.h
+++ b/src/application.h
@@ -46,9 +46,7 @@ typedef struct WApplication {
         unsigned int skip_next_animation:1;
         unsigned int hidden:1;
         unsigned int emulated:1;
-#ifdef BOUNCE_APP
         unsigned int bouncing:1;
-#endif
     } flags;
 } WApplication;
 
diff --git a/src/superfluous.c b/src/superfluous.c
index d5aaf50..8bbef81 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -253,8 +253,6 @@ void DoWindowBirth(WWindow *wwin)
 }
 #endif
 
-#ifdef BOUNCE_APP
-
 #define BOUNCE_HZ      25
 #define BOUNCE_DELAY   (1000/BOUNCE_HZ)
 #define BOUNCE_HEIGHT  24
@@ -402,9 +400,3 @@ void wAppBounce(WApplication *wapp)
                data->timer = WMAddPersistentTimerHandler(BOUNCE_DELAY, 
doAppBounce, data);
        }
 }
-
-#else
-void wAppBounce(WApplication *wapp)
-{
-}
-#endif
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 6045cb7..5008ac6 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -38,9 +38,6 @@
 /* If you want the application icon to be highlighted when it has the focus */
 #define NEWAPPICON
 
-/* If you want the application icon to bounce when opening a dialog etc */
-#define BOUNCE_APP
-
 /* undefine it if you don't want your config files to be preprocessed by cpp */
 #define USECPP
 
-- 
1.7.2.3


-- 
To unsubscribe, send mail to [email protected].

Reply via email to