[sawfish] make update-sawfish-menu work without restart

[Christopher Bratusek <chrisb src gnome org>]

commit 58bda03841c775e5bb97e08eb2c78bc1da59ac82
Author: chrisb <zanghar freenet de>
Date:   Fri Sep 11 16:05:37 2009 +0200

    make update-sawfish-menu work without restart

 ChangeLog                       |    4 ++++
 lisp/sawfish/wm/ext/fdo-menu.jl |   32 ++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0304d73..312a073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* Makedefs.in
 	* Makefile.in: check for installation path of sawfish-ksm.desktop via kde4-config
 
+	* lisp/sawfish/wm/ext/fdo-menu.jl: added copyright header
+	                                   make update-sawfish-menu work without restarting sawfish
+					   -- (after intial call on sawfish-startup) [Matthew Love]
+
 2009-09-08  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/util/prompt.jl: squashed the last compiler warnings [Matthew Love]
 
diff --git a/lisp/sawfish/wm/ext/fdo-menu.jl b/lisp/sawfish/wm/ext/fdo-menu.jl
index eea940f..cbc2ab2 100644
--- a/lisp/sawfish/wm/ext/fdo-menu.jl
+++ b/lisp/sawfish/wm/ext/fdo-menu.jl
@@ -1,10 +1,23 @@
 ;-*-sawfish-*-
-;; (fdo-menu.jl (v1.0.0) --- sawfish wm menu generation -- librep)
+;; (fdo-menu.jl (v1.0.1) sawfish-wm-menu-generation librep)
 
 ;; (c) 2009 Matthew Love
-;; Christopher Bratusek
 
-;; This file will be part of Sawfish
+;; This file is part of sawfish.
+
+;; sawfish is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; sawfish is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with sawfish; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ;;; Description:
 ;;
@@ -267,15 +280,14 @@
 
     ;; Update the menu
     (define (update-saw-menu)
-      (interactive)
       (unless (not use-fdo-menu)
 	(setq *loc-menu* nil)
-	(defvar desk-files (flatten (map-dir-files desktop-directory)))
-	(mapc (lambda (x)
-		(setq *loc-menu* (append *loc-menu* (list (generate-menu-entry x))))) desk-files)
-	(if want-alphabetize
-	    (setq apps-menu (alphabetize-entries (fix-cats menu-cat-alist)))
-	  (setq apps-menu (fix-cats menu-cat-alist)))))
+	(let ((desk-files (flatten (map-dir-files desktop-directory))))
+	  (mapc (lambda (x)
+		  (setq *loc-menu* (append *loc-menu* (list (generate-menu-entry x))))) desk-files)
+	  (if want-alphabetize
+	      (setq apps-menu (alphabetize-entries (fix-cats menu-cat-alist)))
+	    (setq apps-menu (fix-cats menu-cat-alist))))))
 
     (define-command 'update-saw-menu update-saw-menu)
 ))