[sawfish: 2/7] Revert "ChangeLog & NEWS"



commit cd2a609e10f0a33a1787c3eecabee27b1f65bf2a
Author: Christopher Roy Bratusek <nano tuxfamily org>
Date:   Mon Apr 25 18:24:43 2011 +0200

    Revert "ChangeLog & NEWS"
    
    This reverts commit c1d8b58ccddc91af7d949f51c5df141914a3123b.
    
    Conflicts:
    
    	man/news.texi

 ChangeLog                         |   39 -------------------------------------
 configure.in                      |    2 +-
 lisp/sawfish/wm/edge/actions.jl   |    2 -
 lisp/sawfish/wm/edge/conf.jl      |    8 +++---
 lisp/sawfish/wm/edge/hot-spots.jl |   38 +----------------------------------
 lisp/sawfish/wm/windows.jl        |   11 ----------
 man/news.texi                     |    8 +------
 7 files changed, 8 insertions(+), 100 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ea12451..be2a99a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,42 +1,3 @@
-2011-04-16  Christopher Roy Bratusek <nano tuxfamily org>
-	* configure.in: bump minimum rep to 0.92.0
-
-2011-04-15  Christopher Roy Bratusek <nano tuxfamily org>
-	* sawfish.desktop
-	* sawfish-wm.desktop
-	* sawfish-ksm.desktop: unified order
-	                       spec compliance
-			       -- Kim B. Heino
-
-2011-04-14  Christopher Roy Bratusek <nano tuxfamily org>
-	* configure.in
-	* Makefile.in
-	* sounds/Makefile.in
-	* themes/Makefile.in: remove version from install-paths
-
-	* debian/**: merged more stuff from Ian Zimmermann
-
-2011-04-13  Christopher Roy Bratusek <nano tuxfamily org>
-	* Makefile.in: added debclean rule
-	               improved distclean rule
-		       improved gitclean rule
-
-	* config.h.in: removed from GIT
-
-	* config.guess
-	* config.sub: added
-
-	* Makedefs.in
-	* Makefile.in
-	* build-info
-	* sawfish.pc.in
-	* configure.in: removed architecture from install-paths
-
-	* sounds/Makefile.in
-	* src/Makefile.in: minor clean-ups -- Ian Zimmermann
-
-	* debian/**: merged scripts from Ian Zimmermann 
-
 2011-04-12  Christopher Roy Bratusek <nano tuxfamily org>
 	* Makefile.in: don't remove NEWSâ??upon clean or distclean
 
diff --git a/configure.in b/configure.in
index 57d30f6..5eeedbf 100644
--- a/configure.in
+++ b/configure.in
@@ -212,7 +212,7 @@ else FONT_LOADER="X.Org"
 fi
 
 dnl Check for librep
-REP_MIN_VER="0.92.0"
+REP_MIN_VER="0.91.0"
 
 PKG_CHECK_MODULES(LIBREP, librep >= ${REP_MIN_VER}
 		  ,REP_EXECDIR="`pkg-config --variable=repcommonexecdir librep`"
diff --git a/lisp/sawfish/wm/edge/actions.jl b/lisp/sawfish/wm/edge/actions.jl
index 333d811..2700086 100644
--- a/lisp/sawfish/wm/edge/actions.jl
+++ b/lisp/sawfish/wm/edge/actions.jl
@@ -46,8 +46,6 @@
        (edge-flip-invoke edge 'viewport))
       ((none/hot-spot)
        (hot-spot-invoke edge))
-      ((none/hot-move)
-       (hot-move-invoke edge))
       (t nil)))
 
   ;; Entry point without dragging 
diff --git a/lisp/sawfish/wm/edge/conf.jl b/lisp/sawfish/wm/edge/conf.jl
index 2319339..08a3d38 100644
--- a/lisp/sawfish/wm/edge/conf.jl
+++ b/lisp/sawfish/wm/edge/conf.jl
@@ -39,20 +39,20 @@
     :group edge-actions
     :type (choice none/hot-spot viewport-drag flip-workspace flip-viewport))
 
-  (defcustom left-right-edge-move-action 'none/hot-move
+  (defcustom left-right-edge-move-action 'none
     "Action for the left and right screen-edge while moving a window."
     :group edge-actions
-    :type  (choice none/hot-move viewport-drag flip-workspace flip-viewport))
+    :type  (choice none viewport-drag flip-workspace flip-viewport))
 
   (defcustom top-bottom-edge-action 'none/hot-spot
     "Action for the top and bottom screen-edge."
     :group edge-actions
     :type (choice none/hot-spot viewport-drag flip-workspace flip-viewport))
 
-  (defcustom top-bottom-edge-move-action 'none/hot-move
+  (defcustom top-bottom-edge-move-action 'none
     "Action for the top and bottom screen-edge while moving a window."
     :group edge-actions
-    :type  (choice none/hot-move viewport-drag flip-workspace flip-viewport))
+    :type  (choice none viewport-drag flip-workspace flip-viewport))
 
   (defcustom edge-flip-delay 250
     "Delay (in milliseconds) of flipping of viewport / workspace."
diff --git a/lisp/sawfish/wm/edge/hot-spots.jl b/lisp/sawfish/wm/edge/hot-spots.jl
index b8c722a..e88c7ac 100644
--- a/lisp/sawfish/wm/edge/hot-spots.jl
+++ b/lisp/sawfish/wm/edge/hot-spots.jl
@@ -20,8 +20,7 @@
 
 (define-structure sawfish.wm.edge.hot-spots
 
-    (export hot-spot-invoke
-            hot-move-invoke)
+    (export hot-spot-invoke)
 
     (open rep
 	  rep.system
@@ -83,38 +82,5 @@
 		      (mod hot-spot-delay 1000))
 	(when func
 	  ;; non-nil, but not a function?
-	  (error "In hot-spot, you configuration of spot `%s' is wrong; it should be a function." spot))
-	)))
-
-  (defvar left-edge-move-function nil
-    "The function launched when hitting the left-edge.")
-
-  (defvar top-edge-move-function nil
-    "The function launched when hitting the top-edge.")
-
-  (defvar right-edge-move-function nil
-    "The function launched when hitting the right-edge.")
-
-  (defvar bottom-edge-move-function nil
-    "The function launched when hitting the bottom-edge.")
-
-  (define (hot-move-invoke spot)
-    (let ((func (case spot
-		  ((left)
-		   left-edge-move-function)
-		  ((top)
-		   top-edge-move-function)
-		  ((right)
-		   right-edge-move-function)
-		  ((bottom)
-		   bottom-edge-move-function))))
-      (if (functionp func)
-	  (make-timer (lambda ()
-			(allow-events 'async-both)
-			(funcall func))
-		      (quotient hot-spot-delay 1000)
-		      (mod hot-spot-delay 1000))
-	(when func
-	  ;; non-nil, but not a function?
-	  (error "In hot-spot, you configuration of spot `%s' is wrong; it should be a function." spot))
+	  (error "In hot-spot, you configuration of `%s' is wrong; it should be a function." spot))
 	))))
diff --git a/lisp/sawfish/wm/windows.jl b/lisp/sawfish/wm/windows.jl
index 022fc99..8d3cdf4 100644
--- a/lisp/sawfish/wm/windows.jl
+++ b/lisp/sawfish/wm/windows.jl
@@ -60,7 +60,6 @@
 	     call-after-property-changed
 	     call-after-state-changed
 	     rename-window
-	     release-windows
 	     toggle-fixed-postion))
 
     (open rep
@@ -576,16 +575,6 @@ STATES has been changed. STATES may also be a single symbol."
   (define-command 'rename-window rename-window
     #:spec "%W\nsEnter new window name:")
 
-  (define (release-windows #!key warp center)
-    "Release all windows (commonly used for hot-spot while moving)."
-    (synthesize-event (lookup-event "ESC") 'root)
-    (if warp
-        (warp-cursor-to-window warp))
-    (if center
-        (progn
-	  (require 'sawfish.wm.commands.move-cursor)
-          (move-cursor-center))))
-
   (define (toggle-fixed-postion w)
     "Toggle the window property `fixed-position'."
      (if (window-get w 'fixed-position)
diff --git a/man/news.texi b/man/news.texi
index 774c505..5b5faf6 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -14,7 +14,7 @@ Each release lists incompatible changes at its top.
 @c @heading x.y.z ``Code name''
 @c @itemize @bullet
 
- c @item Updated or New dependencies
+ c @item Update dependencies
 @c @itemize @minus
 @c @end itemize
 
@@ -42,12 +42,6 @@ Each release lists incompatible changes at its top.
 @heading 1.8.1 "Sharp As A Knife"
 @itemize @bullet
 
- item Updated or New dependencies
- itemize @minus
-
- item librep 0.91.0 -> 0.92.0
- end itemize
-
 @item Bug Fixes
 @itemize @minus
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]