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

[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  50f809fd65c495b2216993f66a984bf6f4a8c5de (commit)
      from  3a1cb00e971dfcd21d716795e71729af22f99e71 (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 50f809fd65c495b2216993f66a984bf6f4a8c5de
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Wed Dec 14 22:31:02 2011 +0100

    src/clfswm-util.lisp (um-create-xdg-section-list): Add at least the 'Utility menu entry. src/config.lisp (*xdg-section-list*): moved to config.lisp.

diff --git a/ChangeLog b/ChangeLog
index a3bbf34..4ea4b32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-12-14  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/clfswm-util.lisp (um-create-xdg-section-list): Add at least
+	the 'Utility menu entry.
+
+	* src/config.lisp (*xdg-section-list*): moved to config.lisp.
+
 	* src/clfswm-util.lisp (update-menus): Set a default value for
 	searching .desktop files when XDG_DATA_DIRS is not set.
 
diff --git a/src/clfswm-util.lisp b/src/clfswm-util.lisp
index c5b0909..280f733 100644
--- a/src/clfswm-util.lisp
+++ b/src/clfswm-util.lisp
@@ -1263,15 +1263,11 @@ For window: set current child to window or its parent according to window-parent
 
 
 ;;; Standard menu functions - Based on the XDG specifications
-(defconfig *xdg-section-list* (append '(TextEditor FileManager WebBrowser)
-                                      '(AudioVideo Audio Video Development Education Game Graphics Network Office Settings System Utility)
-                                      '(TerminalEmulator Archlinux Screensaver))
-  'Menu "Standard menu sections")
-
-
 (defun um-create-xdg-section-list (menu)
   (dolist (section *xdg-section-list*)
-    (add-sub-menu menu :next section (format nil "~A" section) menu)))
+    (add-sub-menu menu :next section (format nil "~A" section) menu))
+  (unless (find-toplevel-menu 'Utility menu)
+    (add-sub-menu menu :next 'Utility (format nil "~A" 'Utility) menu)))
 
 (defun um-find-submenu (menu section-list)
   (let ((acc nil))
diff --git a/src/config.lisp b/src/config.lisp
index b656b68..85d828b 100644
--- a/src/config.lisp
+++ b/src/config.lisp
@@ -37,6 +37,16 @@
 Example: :mod-2 for num_lock, :lock for Caps_lock...")
 
 
+;;; Standard menu entry based on the XDG specifications
+(defconfig *xdg-section-list* (append
+                               '(TextEditor FileManager WebBrowser)
+                               '(AudioVideo Audio Video Development Education Game Graphics Network
+                                 Office Settings System Utility)
+                               '(TerminalEmulator Screensaver))
+  'Menu "Standard menu sections")
+
+
+
 (defun-equal-wm-class equal-wm-class-rox-pinboard "ROX-Pinboard")
 (defun-equal-wm-class equal-wm-class-xvkbd "xvkbd")
 

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

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


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