[sawfish] Revert "behavior-change in rename-window"

[Christopher Bratusek <chrisb src gnome org>]

commit cb976ad8f885c2418ffb184c0fa1e0a7790977a4
Author: Teika kazura <teika lavabit com>
Date:   Sat Jan 8 13:46:25 2011 +0900

    Revert "behavior-change in rename-window"
    
    This reverts commit 3b72e3e6d24e9a76a8f65b4e285a04ccf4bf272e,
    and subsequent commits eb0bcfa04b49144197f8c9eeb323848ddc376143 and
    2b559e6b84e4cd4cd0d409c169a00439593a531a
    
    The 1.6.0 code is restored.
    
    Conflicts:
    
    	lisp/sawfish/wm/windows.jl

 lisp/sawfish/wm/windows.jl |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/lisp/sawfish/wm/windows.jl b/lisp/sawfish/wm/windows.jl
index 536e9d8..b1b6438 100644
--- a/lisp/sawfish/wm/windows.jl
+++ b/lisp/sawfish/wm/windows.jl
@@ -570,8 +570,11 @@ STATES has been changed. STATES may also be a single symbol."
            state-changes)))
 
   (define (rename-window-func window new-name)
-      (set-x-text-property window 'WM_NAME (vector new-name))
-      (set-x-text-property window 'WM_ICON_NAME (vector new-name)))
+    "Renames WINDOW to NEW-NAME."
+    (set-x-text-property window 'WM_NAME (vector new-name))
+    (set-x-text-property window '_NET_WM_NAME (vector new-name))
+    (set-x-text-property window 'WM_ICON_NAME (vector new-name))
+    (set-x-text-property window '_NET_WM_ICON_NAME (vector new-name)))
 
   (define (rename-window-interactive w)
     (require 'sawfish.wm.util.prompt)