[sawfish: 67/67] Merge branch 'edge-actions'

[Christopher Bratusek <chrisb src gnome org>]

commit 6d162c8b21f7f95c9ba3bf95aafa28ce394c20b8
Merge: cccac9d a2dc71f
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Thu Dec 2 21:22:17 2010 +0100

    Merge branch 'edge-actions'
    
    Conflicts:
    	ChangeLog
    	lisp/sawfish/wm/commands/jump-or-exec.jl
    	lisp/sawfish/wm/windows.jl

 ChangeLog.EA                             |  147 ++++++++++++++++++++
 OPTIONS                                  |    4 +-
 configure.in                             |    2 +-
 lisp/Makefile.in                         |    2 +-
 lisp/sawfish/wm.jl                       |    9 +-
 lisp/sawfish/wm/commands/jump-or-exec.jl |   77 +++++++++--
 lisp/sawfish/wm/custom.jl                |    1 +
 lisp/sawfish/wm/edge/actions.jl          |  134 ++++++++++++++++++
 lisp/sawfish/wm/edge/flip.jl             |   96 +++++++++++++
 lisp/sawfish/wm/edge/hot-spots.jl        |   77 +++++++++++
 lisp/sawfish/wm/edge/util.jl             |   94 +++++++++++++
 lisp/sawfish/wm/edge/viewport-drag.jl    |  101 ++++++++++++++
 lisp/sawfish/wm/ext/edge-flip.jl         |  219 ------------------------------
 lisp/sawfish/wm/ext/infinite-desktop.jl  |  126 -----------------
 lisp/sawfish/wm/ext/match-window.jl      |    3 +-
 lisp/sawfish/wm/user.jl                  |    4 +-
 src/Makefile.in                          |    7 +-
 src/fake-libexec                         |    1 -
 src/flippers.c                           |   39 ++++--
 src/main.c                               |    2 +
 20 files changed, 756 insertions(+), 389 deletions(-)
---
diff --cc lisp/sawfish/wm/user.jl
index 9f8cf36,5fcf549..d0aa1be
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@@ -146,12 -146,11 +146,14 @@@ Possible values are \"kde\", \"gnome\"
        (error
         (format (stderr-file) "error in local config--> %S\n" error-data))))
  
 +  (when (equal desktop-environment "kde")
 +    (sawfish.wm.integration.kde#kde-late-init))
 +
    ;; 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