[sawfish] Bugfix: It was impossible for users to override `kde-desktop-directories'.

[Christopher Bratusek <chrisb src gnome org>]

commit 744b8c02e36d9286300bc02ce0f2c063b33654f8
Author: Teika kazura <teika lavabit com>
Date:   Sat Nov 6 14:53:58 2010 +0900

    Bugfix: It was impossible for users to override `kde-desktop-directories'.

 lisp/sawfish/wm/integration/kde.jl |   12 ++++++++----
 lisp/sawfish/wm/user.jl            |    3 +++
 man/news.texi                      |    4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/lisp/sawfish/wm/integration/kde.jl b/lisp/sawfish/wm/integration/kde.jl
index adce1f5..1901f5f 100644
--- a/lisp/sawfish/wm/integration/kde.jl
+++ b/lisp/sawfish/wm/integration/kde.jl
@@ -20,7 +20,8 @@
 
 (define-structure sawfish.wm.integration.kde
 
-    (export detect-kde)
+    (export detect-kde
+	    kde-late-init)
 
     (open rep
 	  rep.system
@@ -42,8 +43,6 @@
 	  kde-logout-cmd)
       (setq desktop-environment "kde")
       (setq want-poweroff-menu nil)
-      (setq desktop-directory
-	    (append desktop-directory kde-desktop-directories))
 
       ;; invoke the KDE terminal instead of xterm
       (unless (variable-customized-p 'xterm-program)
@@ -77,4 +76,9 @@
   (define (detect-kde)
     (when (getenv "KDE_FULL_SESSION")
       (init)
-      t)))
+      t))
+
+  ;; Should be called after user customization is read.
+  (define (kde-late-init)
+    (setq desktop-directory
+	  (append desktop-directory kde-desktop-directories))))
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index 8407c91..9f8cf36 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -146,6 +146,9 @@ Possible values are \"kde\", \"gnome\", \"xfce\", or \"none\".")
       (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
   (unless batch-mode
     (init-apps-menu))
diff --git a/man/news.texi b/man/news.texi
index 18f92c6..5e646f4 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -52,6 +52,10 @@ invoked, if run without any desktop environment. Fixed it.
 @item Correctly build SawfishPager [Christopher Bratusek]
 
 It is ensured that SawfishPager builds correctly, by improving @file{sawfish.pc} file.
+
+ item KDE *.desktop files location [Teika Kazura]
+Previously, user's change of the variable
+ code{kde-desktop-directories} was ignored, but this is fixed.
 @end itemize
 @item Misc Changes
 @itemize @minus