GNOME.org
 

[sawfish] replace display-url-command by browser-command -- Trimm down GNOME Integration to the minimum -- OPT

commit a09cba8d0866bae0e432525c22c87a8f9c6820d5
Author: chrisb <zanghar freenet de>
Date:   Tue Sep 1 21:32:09 2009 +0200

    replace display-url-command by browser-command -- Trimm down GNOME Integration to the minimum -- OPTIONS updated

 ChangeLog                            |   26 ++
 OPTIONS                              |    9 +-
 lisp/sawfish/wm/autoload.jl          |   10 -
 lisp/sawfish/wm/commands/gnome.jl    |  111 ---------
 lisp/sawfish/wm/commands/help.jl     |   17 +--
 lisp/sawfish/wm/gnome/integration.jl |   18 +-
 lisp/sawfish/wm/menus.jl             |   11 +-
 lisp/sawfish/wm/state/gnome.jl       |  449 ----------------------------------
 lisp/sawfish/wm/user.jl              |    9 -
 man/news.texi                        |    6 +-
 po/POTFILES.in                       |    2 -
 11 files changed, 52 insertions(+), 616 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bf78541..bcca9af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,32 @@
 2009-09-01  Christopher Bratusek <zanghar freenet de>
 	* themes/simple/theme.jl: make windows resizable from right border
 
+	* lisp/sawfish/wm/menus.jl: added Session sub-menu
+				    move Display Errors here
+				    move Restart Sawfish here
+				    move Quit Sawfish here
+
+	* lisp/sawfish/wm/help.jl: removed display-url-commands, use browser-command instead
+	                           removed help-call-info-gnome
+
+	* lisp/sawfish/wm/user.jl: don't load sawfish.wm.state.gnome
+
+	* lisp/sawfish/wm/state/gnome.jl: removed, since we support WM_STATE_*
+
+	* lisp/sawfish/wm/commands/gnome.jl: removed
+
+	* lisp/sawfish/wm/autoload.jl: removed sawfish.wm.commands.gnome autoloads
+
+	* lisp/sawfish/wm/integration.jl: use browser-program instead of display-url-command
+	                                  removed some obsolete bits
+					  append Logout from GNOME to Session sub-menu
+					  append Shutdown from GNOME to Session sub-menu
+					  updated commands for more recent GNOME versions
+
+	* po/POTFILES.in: updated
+
+	* OPTIONS: more updates
+
 2009-08-31  Christopher Bratusek <zanghar freenet de>
 	* CONTRIBUTING: Encoding is changed to utf-8 from latin-1 [Teika Kazura]
 
diff --git a/OPTIONS b/OPTIONS
index 1b3bdd0..551ec3d 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -547,13 +547,8 @@
 ;;  (define-special-variable xterm-program "xterm"
 ;;    "The program launched by the `xterm' command.")
 
-;;  (define-special-variable xterm-args ""
-;;    "Arguments given to the `xterm' command.")
-
-;;  (define-special-variable display-url-command
-;;    "( netscape -remote 'openUrl(%s)' || netscape '%s' ) &"
-;;    "Shell command used to direct a web browser to load a url. Any
-;;`%s' substrings will be replaced by the name of the url.")
+;;  (define-special-variable browser-program "www-browser"
+;;    "The program launched by the `browser' command.")
 
 ;; prompt options
 
diff --git a/lisp/sawfish/wm/autoload.jl b/lisp/sawfish/wm/autoload.jl
index 005036f..b90d490 100644
--- a/lisp/sawfish/wm/autoload.jl
+++ b/lisp/sawfish/wm/autoload.jl
@@ -46,16 +46,6 @@
 (autoload-command 'apropos-function-to-screen 'sawfish.wm.commands.describe)
 (autoload-command 'apropos-variable 'sawfish.wm.commands.describe)
 (autoload-command 'apropos-variable-to-screen 'sawfish.wm.commands.describe)
-(autoload-command 'gnome-toggle-skip-winlist 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-set-skip-winlist 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-clear-skip-winlist 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-toggle-skip-tasklist 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-set-skip-tasklist 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-clear-skip-tasklist 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-logout 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-www-page 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-help-browser 'sawfish.wm.commands.gnome)
-(autoload-command 'gnome-about 'sawfish.wm.commands.gnome)
 (autoload-command 'make-group-sticky 'sawfish.wm.commands.groups)
 (autoload-command 'make-group-unsticky 'sawfish.wm.commands.groups)
 (autoload-command 'toggle-group-sticky 'sawfish.wm.commands.groups)
diff --git a/lisp/sawfish/wm/commands/help.jl b/lisp/sawfish/wm/commands/help.jl
index e2905af..d87a3d6 100644
--- a/lisp/sawfish/wm/commands/help.jl
+++ b/lisp/sawfish/wm/commands/help.jl
@@ -22,8 +22,7 @@
 (define-structure sawfish.wm.commands.help
 
     (export display-url
-	    help-call-info
-	    help-call-info-gnome)
+	    help-call-info)
 
     (open rep
 	  rep.system
@@ -38,26 +37,14 @@
     (xterm (format nil "info '%s' '%s'"
 		    document node)))
 
-  (define (help-call-info-gnome document node)
-    (while (string-match " " node)
-      (setq node (concat (substring node 0 (match-start)) ?_
-			 (substring node (match-end)))))
-    (system (format nil "gnome-help 'info:%s#%s' >/dev/null 2>&1 </dev/null &"
-		    document node)))
-
   (defvar help-display-info-function help-call-info)
 
   ;; WWW
 
-  (defvar display-url-command
-    "( netscape -remote 'openUrl(%s)' || netscape '%s' ) &"
-    "Shell command used to direct a web browser to load a url. Any `%s'
-substrings will be replaced by the name of the url.")
-
   (define (display-url url)
     (let ((args (list url)))
       (rplacd args args)
-      (system (apply format nil display-url-command args))))
+      (system (apply format nil browser-program args))))
 
   ;; Commands
 
diff --git a/lisp/sawfish/wm/gnome/integration.jl b/lisp/sawfish/wm/gnome/integration.jl
index 2a9cd4b..84907d3 100644
--- a/lisp/sawfish/wm/gnome/integration.jl
+++ b/lisp/sawfish/wm/gnome/integration.jl
@@ -22,9 +22,9 @@
 (define-structure sawfish.wm.gnome.integration ()
 
     (open rep
-	  sawfish.wm.state.gnome
 	  sawfish.wm.menus
 	  sawfish.wm.custom
+	  sawfish.wm.commands
 	  sawfish.wm.commands.help
 	  sawfish.wm.commands.user)
 
@@ -35,13 +35,19 @@
     (setq xterm-program "x-terminal-emulator"))
 
   ;; use the GNOME help browser and url launcher
-  (setq help-display-info-function help-call-info-gnome)
-  (setq display-url-command "gnome-www-browser %s &")
+  (setq browser-program "gnome-www-browser %s &")
 
   ;; add some GNOME help menus
   (let ((menu (assoc (_ "_Help") root-menu)))
     (when menu
       (nconc menu `(()
-		    (,(_ "_GNOME Help...") gnome-help-browser)
-		    (,(_ "GNOME WWW...") gnome-www-page)
-		    (,(_ "About GNOME...") gnome-about))))))
+		    (,(_ "_GNOME Help") (system "yelp &"))
+		    (,(_ "GNOME Website") (display-url "http://www.gnome.org";))
+		    (,(_ "About GNOME") (system "gnome-about &"))))))
+
+  ;; add gnome-logout menu item
+  (let ((menu (assoc (_ "Sessi_on") root-menu)))
+    (when menu
+      (nconc menu `(()
+                   (,(_ "_Logout from GNOME") (system "gnome-session-save --logout-dialog &"))
+		   (,(_ "_Shutdown from GNOME") (system "gnome-session-save --shutdown-dialog &")))))))
diff --git a/lisp/sawfish/wm/menus.jl b/lisp/sawfish/wm/menus.jl
index 37ffbf6..a8bebba 100644
--- a/lisp/sawfish/wm/menus.jl
+++ b/lisp/sawfish/wm/menus.jl
@@ -149,6 +149,11 @@ before killing it.")
       (,(_ "_Programs") . apps-menu)
       (,(_ "_Customize") . custom-menu)
       ()
+      (,(_ "Sessi_on")
+       (,(_ "Display Errors") display-errors)
+       (,(_ "Restart Sawfish") restart)
+       (,(_ "Quit Sawfish") quit))
+      ()
       (,(_ "_Help")
        (,(_ "_FAQ...") help:show-faq)
        (,(_ "_News...") help:show-news)
@@ -157,11 +162,7 @@ before killing it.")
        ()
        (,(_ "_About Sawfish...") help:about))
       ()
-      (,(_ "_Display Errors") display-errors)
-      (,(_ "_Kill Window") (system "xkill &"))
-      ()
-      (,(_ "_Restart") restart)
-      (,(_ "_Quit") quit)))
+      (,(_ "Kill Window") (system "xkill &"))))
 
   (defvar apps-menu)
   
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index 624c4a6..7cd94c2 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -129,15 +129,6 @@
   ;; load the new WM-spec code by default now
   (load-module 'sawfish.wm.state.wm-spec)
 
-  ;; might it be useful to load the old GNOME support?
-  (unless batch-mode
-    (catch 'out
-      (mapc (lambda (prop)
-	      (when (string-match "^GNOME_" (symbol-name prop))
-		(load-module 'sawfish.wm.state.gnome)
-		(throw 'out t)))
-	    (list-x-properties 'root))))
-
   ;; Use all arguments which are left.
   (let ((do-load (lambda (name)
 		   (cond ((file-exists-p name)
diff --git a/man/news.texi b/man/news.texi
index bbbcf44..62599f9 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -92,7 +92,9 @@ your system, but the later doesn't
 
 @item When GNOME Integration is loaded, don't remove @code{quit} and @code{restart} entries from menu [Christopher Bratusek]
 
- item Use @code{gnome-www-browser} for displaying GNOME-Homepage instead of ancient @code{gnome-moz-remote} [Christopher Bratusek]
+ item When GNOME Integration is loaded, append @code{Logout}- and @code{Shutdown from GNOME} entries to Session sub-menu [Christopher Bratusek]
+
+ item Updated commands in GNOME Integration for more recent GNOME versions [Christopher Bratusek]
 
 @item Make strings in Sawfish-UI fully translatable [Alexey I. Froloff]
 
@@ -112,7 +114,7 @@ your system, but the later doesn't
 
 @item Revamped the Root and Window Menu [Christopher Bratusek]
 
- item Trimm down GNOME Integration to the minimum [Christopher Bratusek]
+ item Trimmed down GNOME Integration to the minimum [Christopher Bratusek]
 
 @item Make sure docks/panels are unframed [Timo Korvola]
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 98db766..ca13315 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,7 +19,6 @@ lisp/sawfish/wm/autoload.jl
 lisp/sawfish/wm/commands.jl
 lisp/sawfish/wm/commands/cycle.jl
 lisp/sawfish/wm/commands/describe.jl
-lisp/sawfish/wm/commands/gnome.jl
 lisp/sawfish/wm/commands/groups.jl
 lisp/sawfish/wm/commands/grow-pack.jl
 lisp/sawfish/wm/commands/help.jl
@@ -53,7 +52,6 @@ lisp/sawfish/wm/menus.jl
 lisp/sawfish/wm/placement.jl
 lisp/sawfish/wm/placement/stagger.jl
 lisp/sawfish/wm/stacking.jl
-lisp/sawfish/wm/state/gnome.jl
 lisp/sawfish/wm/state/iconify.jl
 lisp/sawfish/wm/state/ignored.jl
 lisp/sawfish/wm/state/maximize.jl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]