[sawfish/sawfish-2.90] reverted some stuff: edge-flip-enabled as global/goalled symbol

[Christopher Bratusek <chrisb src gnome org>]

commit db424bc6d121f6308de5f2da8da3969b6e22f1f5
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sun Oct 24 21:22:22 2010 +0200

    reverted some stuff:
    edge-flip-enabled as global/goalled symbol

 ChangeLog                    |    6 +-----
 lisp/sawfish/wm/edge/flip.jl |    2 +-
 lisp/sawfish/wm/gaol.jl      |    3 +--
 src/flippers.c               |   15 +++------------
 src/sawfish_subrs.h          |    3 ---
 5 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index efcfdd3..fabf58a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,8 @@
 2010-10-24  Christopher Bratusek <zanghar freenet de>
-	* src/flippers.c: add edge-flip-enabled as global symbol
-	                  add recreate-flippers function
+	* src/flippers.c: add recreate-flippers function
 			  don't auto-enable flippers when loading
 			  renamed module to sawfish.wm.edge.flippers
 
-	* src/sawfish_subrs.h
-	* lisp/sawfish/wm/gaol.jl: add edge-flip-eanbled
-
 	* lisp/sawfish/wm/ext/edge-flip.jl: open sawfish.wm.util.flippers
 	                                    remove the eval-when-compile call
 					    removed three unneeded exports
diff --git a/lisp/sawfish/wm/edge/flip.jl b/lisp/sawfish/wm/edge/flip.jl
index c103870..5f6ee40 100644
--- a/lisp/sawfish/wm/edge/flip.jl
+++ b/lisp/sawfish/wm/edge/flip.jl
@@ -81,7 +81,7 @@
   (define (edge-flip-enable)
     (if (and edge-flip-enabled (not edge-flip-only-when-moving))
 	(progn
-          (flippers-activate t)
+	  (flippers-activate t)
 	  ;; XXX split all that stuff from edge-flip, so that
 	  ;; XXX HS and ID work, even if EF is disabled
 	  (unless (in-hook-p 'before-edge-lip-hook before-flip)
diff --git a/lisp/sawfish/wm/gaol.jl b/lisp/sawfish/wm/gaol.jl
index 5b7aa84..7d2dbd8 100644
--- a/lisp/sawfish/wm/gaol.jl
+++ b/lisp/sawfish/wm/gaol.jl
@@ -59,8 +59,7 @@
   (define safe-specials
     '(default-foreground display-name canonical-display-name
       default-font default-frame nil-frame frame-part-classes
-      decorate-transients batch-mode default-directory
-      edge-flip-enabled))
+      decorate-transients batch-mode default-directory))
 
   (define safe-features '(sawfish.wm.util.gtkrc
 			  sawfish.wm.util.x
diff --git a/src/flippers.c b/src/flippers.c
index 785605a..7cdf68d 100644
--- a/src/flippers.c
+++ b/src/flippers.c
@@ -29,9 +29,6 @@ DEFSYM(top, "top");
 DEFSYM(bottom, "bottom");
 DEFSYM(enter_flipper_hook, "enter-flipper-hook");
 DEFSYM(leave_flipper_hook, "leave-flipper-hook");
-/* perhaps edges-activated is better, if ID and HS 
- * become independent of EF? */
-DEFSYM(edge_flip_enabled, "edge-flip-enabled");
 
 DEFUN("enable-flippers", Fenable_flippers, Senable_flippers, (void), rep_Subr0)
 {
@@ -151,14 +148,9 @@ DEFUN("create-flippers", Fcreate_flippers,
 DEFUN("recreate-flippers", Frecreate_flippers,
       Srecreate_flippers, (void), rep_Subr0)
 {
-	if (!rep_NILP(global_symbol_value (Qedge_flip_enabled)))
-	{
-
-		Fdisable_flippers();
-		Fcreate_flippers();
-		Fenable_flippers();
-
-	}
+	Fdisable_flippers();
+	Fcreate_flippers();
+	Fenable_flippers();
 
 	return Qt;
 }
@@ -180,7 +172,6 @@ rep_dl_init (void)
     rep_INTERN (bottom);
     rep_INTERN_SPECIAL (enter_flipper_hook);
     rep_INTERN_SPECIAL (leave_flipper_hook);
-    rep_INTERN_SPECIAL (edge_flip_enabled);
 
     return rep_pop_structure (tem);
 }
diff --git a/src/sawfish_subrs.h b/src/sawfish_subrs.h
index f64f25b..33c5c32 100644
--- a/src/sawfish_subrs.h
+++ b/src/sawfish_subrs.h
@@ -103,9 +103,6 @@ extern repv Fcurrent_event_window (repv win);
 extern void events_init (void);
 extern void events_kill (void);
 
-/* from flippers.c */
-extern repv Qedge_flip_enable;
-
 /* from fonts.c */
 extern int font_type;
 extern repv Qdefault_font;