[sawfish] fixed a glitch in rename-window-interactive

[Christopher Bratusek <chrisb src gnome org>]

commit 1cb6caada693b423fdddbc07be27b9c5df6dccff
Author: chrisb <zanghar freenet de>
Date:   Mon Sep 14 15:18:53 2009 +0200

    fixed a glitch in rename-window-interactive

 ChangeLog                           |    2 ++
 lisp/sawfish/wm/autoload.jl         |    1 +
 lisp/sawfish/wm/ext/match-window.jl |   13 +++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4202bdc..66c4a26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2009-09-14  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/ext/match-window.jl: string change in rename-window
 	                                       improved keymap-trans
+					       renamed rename-window to rename-window-func
+					       fixed a glitch in rename-window-interactive
 
 2009-09-13  Christopher Bratusek <zanghar freenet de>
 	* sawfish.doap: added
diff --git a/lisp/sawfish/wm/autoload.jl b/lisp/sawfish/wm/autoload.jl
index b90d490..d97644c 100644
--- a/lisp/sawfish/wm/autoload.jl
+++ b/lisp/sawfish/wm/autoload.jl
@@ -143,6 +143,7 @@
 (autoload-command 'xterm 'sawfish.wm.commands.user)
 (autoload-command 'browser 'sawfish.wm.commands.user)
 (autoload-command '3d-hack 'sawfish.wm.ext.3d-hack)
+(autoload-command 'rename-window 'sawfish.wm.ext.match-window)
 (defgroup audio "Sound" :require sawfish.wm.ext.audio-events)
 (defgroup match-window "Matched Windows" :layout single :require sawfish.wm.ext.match-window)
 (defgroup tooltips "Tooltips" :group appearance :require sawfish.wm.ext.tooltips)
diff --git a/lisp/sawfish/wm/ext/match-window.jl b/lisp/sawfish/wm/ext/match-window.jl
index f8defb3..b8e05ac 100644
--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@ -46,7 +46,7 @@
 	    add-window-matcher
 	    remove-window-matcher
 	    match-window
-	    rename-window
+	    rename-window-func
 	    rename-window-interactive)
 
     (open rep
@@ -471,7 +471,7 @@
     (lambda (w prop value)
       (declare (unused prop))
       (when value
-        (rename-window w value))))
+        (rename-window-func w value))))
 
   (define-match-window-setter 'maximized
    (lambda (w prop value)
@@ -492,11 +492,12 @@
               (lambda () (interactive)
                 (synthesize-event (lookup-event (cadr pair)) (current-event-window))))) value))))
 
-  (define (rename-window window new-name)
-    (set-x-text-property window 'WM_NAME (vector new-name)
-    (set-x-text-property window '_NET_WM_NAME (vector new-name))))
+  (define (rename-window-func window new-name)
+    (set-x-text-property window 'WM_NAME (vector new-name))
+    (set-x-text-property window '_NET_WM_NAME (vector new-name)))
 
   (define (rename-window-interactive w)
-    (rename-window w (prompt-for-string "Enter new window-title:" (window-name w))))
+    (let ((new-name (prompt-for-string "Enter new window title:" (window-name w))))
+      (rename-window-func w new-name)))
 
   (define-command 'rename-window rename-window-interactive #:spec "%W"))