[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1106-8-g3a1cb00

[Philippe Brochard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CLFSWM - A(nother) Common Lisp FullScreen Window Manager".

The branch, master has been updated
       via  3a1cb00e971dfcd21d716795e71729af22f99e71 (commit)
      from  51b0a027b1e29efb046d40f4962095fdbb3d2fe8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3a1cb00e971dfcd21d716795e71729af22f99e71
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Wed Dec 14 22:05:37 2011 +0100

    src/clfswm-util.lisp (update-menus): Set a default value for searching .desktop files when XDG_DATA_DIRS is not set.

diff --git a/ChangeLog b/ChangeLog
index a3e8984..a3bbf34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-14  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-util.lisp (update-menus): Set a default value for
+	searching .desktop files when XDG_DATA_DIRS is not set.
+
 2011-10-15  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-internal.lisp (place-window-from-hints): Use
diff --git a/src/clfswm-util.lisp b/src/clfswm-util.lisp
index 615f123..c5b0909 100644
--- a/src/clfswm-util.lisp
+++ b/src/clfswm-util.lisp
@@ -1318,7 +1318,8 @@ For window: set current child to window or its parent according to window-parent
   (let ((count 0)
 	(found (make-hash-table :test #'equal)))
     (dolist (dir (remove-duplicates
-		  (split-string (getenv "XDG_DATA_DIRS") #\:) :test #'string-equal))
+		  (split-string (or (getenv "XDG_DATA_DIRS") "/usr/local/share/:/usr/share/")
+                                #\:) :test #'string-equal))
       (dolist (desktop (directory (concatenate 'string dir "/applications/**/*.desktop")))
 	(unless (gethash (file-namestring desktop) found)
 	  (setf (gethash (file-namestring desktop) found) t)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |    5 +++++
 src/clfswm-util.lisp |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CLFSWM - A(nother) Common Lisp FullScreen Window Manager