[sawfish] Fixed a bug in viewport.jl; select-workspace-and-viewport would not select the proper viewport.

[Jeremy Hankins <jjhankins src gnome org>]

commit 90bbf42bc06540b286b3a4d65aba55efc5da97f7
Author: Jeremy Hankins <nowan nowan org>
Date:   Wed Jan 6 10:02:08 2010 -0600

    Fixed a bug in viewport.jl; select-workspace-and-viewport would not select
    the proper viewport.

 ChangeLog                   |    4 +++-
 lisp/sawfish/wm/viewport.jl |    4 ++--
 man/news.texi               |    3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cab4463..acc4bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2010-01-06  Jeremy Hankins <nowan nowan org>
 	* lisp/sawfish/wm/viewport.jl: Reset the viewport to 0,0 on exit
 		  for *all* workspaces.  This prevents windows from ending
-		  up in strange places on restart.
+		  up in strange places on restart.  Also fixed a bug in
+		  select-workspace-and-viewport where it would not select
+		  the correct viewport.
 
 2010-01-03  Christopher Bratusek <zanghar freenet de>
 	* Makefile.in: + add gitclean target
diff --git a/lisp/sawfish/wm/viewport.jl b/lisp/sawfish/wm/viewport.jl
index a2ca3a3..c16491c 100644
--- a/lisp/sawfish/wm/viewport.jl
+++ b/lisp/sawfish/wm/viewport.jl
@@ -314,8 +314,8 @@ viewport is within `viewport-dimensions'."
       t))
 
   (define (select-workspace-and-viewport space col row)
-    (select-workspace space nil (lambda ()
-				  (set-screen-viewport col row))))
+    (select-workspace space)
+    (set-screen-viewport col row))
 
   ;; returns t if it actually moved the viewport
   (define (move-viewport right down)
diff --git a/man/news.texi b/man/news.texi
index 79734f7..8826c5f 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -64,8 +64,7 @@ sawfish on several architectures. From this version on, we don't ship it anymore
 viewport when displaying all workspaces.
 [Jeremy Hankins]
 
- item Fixed a minor bug in viewport.jl where windows could occasionally
-end up outside of viewport limits on restart.
+ item Fixed minor bugs in viewport.jl.
 [Jeremy Hankins]
 @end itemize