[sawfish] several improvements to sawfish.wm.gnome.integration

[Christopher Bratusek <chrisb src gnome org>]

commit dfc96b9ddc96da7910c85aa7bc0b07ccefc844fa
Author: chrisb <zanghar freenet de>
Date:   Sun Jul 26 09:51:45 2009 +0200

    several improvements to sawfish.wm.gnome.integration

 ChangeLog                            |    6 ++++++
 lisp/sawfish/wm/gnome/integration.jl |   17 +++--------------
 man/news.texi                        |    4 ++++
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 594e7af..1bb59c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
 	* lisp/sawfish/wm/tabs/tabgroup.jl
 	* lisp/sawfish/wm/util/marks.jl: fixed license header
 
+	* lisp/sawfish/wm/gnome-integration.jl: don't remove quit and restart entries from menu
+	                                        use gnome-www-browser instead of ancient gnome-moz-remote
+						display applications in the apps-menu (currently uncategorized)
+					        remove Applnk from application search paths
+						removed some yet obsolete code
+
 2009-07-25  Christopher Bratusek <zanghar freenet de>
 	* src/Makefile.in: include $CFLAGS in gtk-style rule
 
diff --git a/lisp/sawfish/wm/gnome/integration.jl b/lisp/sawfish/wm/gnome/integration.jl
index cdda373..ed3ab07 100644
--- a/lisp/sawfish/wm/gnome/integration.jl
+++ b/lisp/sawfish/wm/gnome/integration.jl
@@ -32,19 +32,8 @@
 
   (define-structure-alias gnome-int sawfish.wm.gnome.integration)
 
-  ;; delete the `Restart' and `Quit' items from the root menu
-  (let ((restart (rassoc '(restart) root-menu))
-	(quit (rassoc '(quit) root-menu)))
-;;	(programs (rassoc 'apps-menu root-menu)))
-    (when restart
-      (setq root-menu (delq restart root-menu)))
-    (when quit
-      (setq root-menu (delq quit root-menu)))
-    ;; FIXME: until GNOME 2 applications are supported
-;;    (when programs
-;;      (setq root-menu (delq programs root-menu)))
-    (when (null (last root-menu))
-      (setq root-menu (delq (last root-menu) root-menu))))
+  (when (null (last root-menu))
+    (setq root-menu (delq (last root-menu) root-menu)))
 
   ;; this option was removed for gnome2
   (put 'gnome-use-capplet 'custom-obsolete t)
@@ -55,7 +44,7 @@
 
   ;; use the GNOME help browser and url launcher
   (setq help-display-info-function help-call-info-gnome)
-  (setq display-url-command "gnome-moz-remote --newwin '%s'")
+  (setq display-url-command "gnome-www-browser %s &")
 
   ;; add some GNOME help menus
   (let ((menu (assoc (_ "_Help") root-menu)))
diff --git a/man/news.texi b/man/news.texi
index 8cc419b..d5124fa 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -44,6 +44,10 @@ they occurred between. For more detailed information see the
 
 @item When GNOME Integration is loaded, the apps menu now shows the content of the GNOME Menu (uncategorized atm) [Christopher Bratusek]
 
+ item When GNOME Integration is loaded, don't remove quit and restart entries from menu [Christopher Bratusek]
+
+ item Use gnome-www-browser for displaying GNOME-Homepage instead of gnome-moz-remote [Christopher Bratusek]
+
 @item Make strings in sawfish-ui fully translatable [Alexey I. Froloff]
 @end itemize
 @item Other Changes: