[sawfish/edge-actions] fix automatic screen-edges initialization

[Christopher Bratusek <chrisb src gnome org>]

commit 6a3879a7824d6f7d336681520d95213cd7ac4bed
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sat Nov 20 10:28:21 2010 +0100

    fix automatic screen-edges initialization

 lisp/sawfish/wm/edge/actions.jl |    3 ---
 lisp/sawfish/wm/user.jl         |    4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/lisp/sawfish/wm/edge/actions.jl b/lisp/sawfish/wm/edge/actions.jl
index cad8400..a69bb93 100644
--- a/lisp/sawfish/wm/edge/actions.jl
+++ b/lisp/sawfish/wm/edge/actions.jl
@@ -38,9 +38,6 @@
   (define func nil)
   (define no-enter nil)
 
-  ;;â??initialize the screen edges
-  (edges-activate t)
-
   (defcustom edge-actions-delay 250
     "Delay (in miliseconds) before the edges are activated.
 hot-spots are activated in half that time, viewport-drag is
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index 8407c91..5fcf549 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -147,8 +147,10 @@ Possible values are \"kde\", \"gnome\", \"xfce\", or \"none\".")
        (format (stderr-file) "error in local config--> %S\n" error-data))))
 
   ;; generate apps-menu from *.desktop files
+  ;; initialize the screen-edges
   (unless batch-mode
-    (init-apps-menu))
+    (init-apps-menu)
+    (edges-activate t))
 
   ;; apply customized font-colors
   (if use-custom-font-color