[sawfish] sawfish.wm.gnome.integration -> sawfish.wm.integration.gnome; doc + autotools update



commit a4b524383127d7c382b9525053c603cdbe32d608
Author: chrisb <zanghar freenet de>
Date:   Wed Sep 2 21:56:07 2009 +0200

    sawfish.wm.gnome.integration -> sawfish.wm.integration.gnome; doc + autotools update

 ChangeLog                                          |   19 +++++++++++++++++++
 lisp/Makefile.in                                   |    4 ++--
 lisp/sawfish/wm/defaults.jl                        |    2 +-
 .../{gnome/integration.jl => integration/gnome.jl} |   12 ++++++------
 man/faq.texi                                       |    2 +-
 po/POTFILES.in                                     |    2 +-
 6 files changed, 30 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bcca9af..11f3ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2009-09-02  Christopher Bratusek <zanghar freenet de>
+	* lisp/sawfish/wm/commands/user.jl
+	* lisp/sawfish/wm/commands/help.jl: replace display-url by browser
+	                                    improved browser command
+
+	* lisp/sawfish/wm/gnome/integration.jl
+	* lisp/sawfish/wm/integration/gnome.jl: renamed file
+	                                        correctly change of browser-command
+	                                        only change browser-command if not customized
+						use browser instead of display-url
+
+	* lisp/sawfish/wm/ext/fdo-menu.jl: fixed a bug in language setting
+	                                   removed obsolete code
+					   trimmed down code
+					   clean-up
+					   -- [Matthew Love]
+
+	* lisp/sawfish/wm/menus.jl: renamed `All Settings' menu-item to `Sawfish-UI'
+
 2009-09-01  Christopher Bratusek <zanghar freenet de>
 	* themes/simple/theme.jl: make windows resizable from right border
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index f7ae4ac..1caac28 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -42,9 +42,9 @@ SUBDIRS := sawfish/gtk sawfish/ui
 
 INSTALL_DIRS := \
 	sawfish sawfish/wm sawfish/wm/ext \
-	sawfish/wm/placement \
+	sawfish/wm/placement sawfish/wm/integration \
 	sawfish/wm/animation sawfish/wm/theming \
-	sawfish/wm/state sawfish/wm/gnome sawfish/wm/util \
+	sawfish/wm/state sawfish/wm/util \
 	sawfish/wm/commands sawfish/wm/session \
 	sawfish/wm/tabs
 
diff --git a/lisp/sawfish/wm/defaults.jl b/lisp/sawfish/wm/defaults.jl
index c6e9189..822ed36 100644
--- a/lisp/sawfish/wm/defaults.jl
+++ b/lisp/sawfish/wm/defaults.jl
@@ -32,7 +32,7 @@
 ;; extra GNOME integration module
 (unless batch-mode
   (if (getenv "GNOME_DESKTOP_SESSION_ID")
-    (require 'sawfish.wm.gnome.integration)))
+    (require 'sawfish.wm.integration.gnome)))
 
 ;; save errors to aid debugging
 (require 'sawfish.wm.ext.error-handler)
diff --git a/lisp/sawfish/wm/gnome/integration.jl b/lisp/sawfish/wm/integration/gnome.jl
similarity index 83%
rename from lisp/sawfish/wm/gnome/integration.jl
rename to lisp/sawfish/wm/integration/gnome.jl
index 84907d3..55eaa0d 100644
--- a/lisp/sawfish/wm/gnome/integration.jl
+++ b/lisp/sawfish/wm/integration/gnome.jl
@@ -19,30 +19,30 @@
 ;; along with sawfish; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(define-structure sawfish.wm.gnome.integration ()
+(define-structure sawfish.wm.integration.gnome ()
 
     (open rep
 	  sawfish.wm.menus
 	  sawfish.wm.custom
 	  sawfish.wm.commands
-	  sawfish.wm.commands.help
 	  sawfish.wm.commands.user)
 
-  (define-structure-alias gnome-int sawfish.wm.gnome.integration)
+  (define-structure-alias gnome-int sawfish.wm.integration.gnome)
 
   ;; invoke the GNOME terminal instead of xterm
   (unless (variable-customized-p 'xterm-program)
-    (setq xterm-program "x-terminal-emulator"))
+    (setq xterm-program "gnome-terminal.wrapper"))
 
   ;; use the GNOME help browser and url launcher
-  (setq browser-program "gnome-www-browser %s &")
+  (unless (variable-customized-p 'browser-program)
+    (setq browser-program "gnome-www-browser"))
 
   ;; add some GNOME help menus
   (let ((menu (assoc (_ "_Help") root-menu)))
     (when menu
       (nconc menu `(()
 		    (,(_ "_GNOME Help") (system "yelp &"))
-		    (,(_ "GNOME Website") (display-url "http://www.gnome.org";))
+		    (,(_ "GNOME Website") (browser "http://www.gnome.org";))
 		    (,(_ "About GNOME") (system "gnome-about &"))))))
 
   ;; add gnome-logout menu item
diff --git a/man/faq.texi b/man/faq.texi
index e722a50..80a7b85 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -51,7 +51,7 @@ This is a system default lisp library. It loads some of the common
 window manager features. More precisely, it currently does:
 
 @itemize
- item Gnome setup, by opening @code{sawfish.wm.gnome.integration},
+ item Gnome setup, by opening @code{sawfish.wm.integration.gnome},
 if Gnome is running.
 @item Error handling enhancements, by opening 
 @code{sawfish.wm.ext.error-handler} 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ca13315..89f8edd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,7 +46,7 @@ lisp/sawfish/wm/ext/window-history.jl
 lisp/sawfish/wm/ext/workspace-grid.jl
 lisp/sawfish/wm/focus.jl
 lisp/sawfish/wm/frames.jl
-lisp/sawfish/wm/gnome/integration.jl
+lisp/sawfish/wm/integration/gnome.jl
 lisp/sawfish/wm/keymaps.jl
 lisp/sawfish/wm/menus.jl
 lisp/sawfish/wm/placement.jl



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]