[sawfish] improvements on wm.defaults wm.extras wm.user

[Christopher Bratusek <chrisb src gnome org>]

commit 2adcf6187f5cb51fec3f862670b4fde771c381a5
Author: chrisb <zanghar freenet de>
Date:   Sun Sep 6 22:07:56 2009 +0200

    improvements on wm.defaults wm.extras wm.user

 ChangeLog                   |    8 ++++++++
 lisp/sawfish/wm/defaults.jl |    8 ++++++++
 lisp/sawfish/wm/extras.jl   |   31 -------------------------------
 lisp/sawfish/wm/user.jl     |   20 +++++++++-----------
 4 files changed, 25 insertions(+), 42 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 96f9dad..1dede26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 2009-09-06  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/ext/fdo-menu.jl: Partial rewrite of fdo-menu [Matthew Love]
 
+	* lisp/sawfish/wm/user.jl
+	* lisp/sawfish/wm/defaults.jl
+	* lisp/sawfish/wm/extras.jl: sawfish.wm.extras removed
+	                             moved try-require from extras to defaults
+				     since gnome-int does no longer change the behaviour of sawfish itself
+				     load defaults even if there's an rc file
+				     generate the fdo-menu if there's no customized apps-menu
+
 2009-09-05  Christopher Bratusek <zanghar freenet de>
 	* sawfish.spec.in: improved [Kim B. Heino]
 
diff --git a/lisp/sawfish/wm/defaults.jl b/lisp/sawfish/wm/defaults.jl
index 80511e3..aa8eb5b 100644
--- a/lisp/sawfish/wm/defaults.jl
+++ b/lisp/sawfish/wm/defaults.jl
@@ -42,3 +42,11 @@
 
 ;; save errors to aid debugging
 (require 'sawfish.wm.ext.error-handler)
+
+;; try-require
+;; try to trequire a script, but don't
+;; err if failed, just place a message
+(define (try-require sym)
+  (condition-case nil
+      (require sym)
+    (error nil)))
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index 7cd94c2..bab45ab 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -45,7 +45,8 @@
 	   sawfish.wm
 	   sawfish.wm.util.groups
 	   sawfish.wm.util.display-window
-	   sawfish.wm.util.compat)
+	   sawfish.wm.util.compat
+	   sawfish.wm.ext.fdo-menu)
      (set-binds))
 
   (setq *user-structure* 'user)
@@ -94,13 +95,8 @@
 				      (or (file-exists-p f)
 					  (file-exists-p (concat f ".jl"))
 					  (file-exists-p (concat f ".jlc"))))))
-	      ;; load these before customized settings (but only if there's
-	      ;; no .sawfishrc file)
-	      (unless (let loop ((rest rc-files))
-			(when rest
-			  (or (rc-file-exists-p (car rest))
-			      (loop (cdr rest)))))
-	        (load "sawfish/wm/defaults" t))
+	      ;; load these before customized settings
+	      (load "sawfish/wm/defaults" t)
 
 	      ;; then the customized options
 	      (condition-case data
@@ -113,12 +109,14 @@
 		(when rest
 		  (if (rc-file-exists-p (car rest))
 		      (safe-load (car rest) t t t)
-		    (loop (cdr rest)))))
-		    
-	      (load "sawfish/wm/extras" t))))
+		    (loop (cdr rest))))))))
       (error
        (format (stderr-file) "error in local config--> %S\n" error-data))))
 
+  ;; use a default menu if none is given
+  (unless (or batch-mode apps-menu)
+    (update-saw-menu))
+
   ;; use a default theme if none given
   (unless (or batch-mode default-frame-style)
     (setq default-frame-style fallback-frame-style))