Hi, the attached patch fixes "poweroff" issue in 1.7.0. Please branch off from 1.7.0 (the HEAD is already contaminated; it has a bug by me. :P), and apply it. It doesn't touch configure.in, since I don't know what to do with the variable "subversion". (Does version="1.7.0.1" suffice?)
We have to release 1.7.0.1 for distributors, but should it be now, or wait for a week or two, to wait for more bug reports? The patch can be applied with git-am which is better than the usual git-apply. For the HEAD, I've sent a merge request in another messeage. Thanks a lot. Teika (Teika kazura)
>From 952904d609de4e4ad45c1043d3f2423e788bafb3 Mon Sep 17 00:00:00 2001 From: Teika kazura <[email protected]> Date: Tue, 12 Oct 2010 09:38:28 +0900 Subject: [PATCH] "Poweroff" bugfix of 1.7.0. In 1.7.0, poweroff related commands under root-menu -> session can't be invoked. This is fixed. News & ChangeLog. --- ChangeLog | 6 ++++++ lisp/sawfish/wm/menus.jl | 10 +++++----- man/news.texi | 8 ++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 939ecab..f52534a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-12 Teika kazura <[email protected]> + * lisp/sawfish/wm/menus.jl: + * man/news.texi: "Poweroff" bugfix. + In 1.7.0, poweroff related commands under root-menu -> session can't + be invoked. This is fixed. + 2010-09-25 Teika kazura <[email protected]> * lisp/sawfish/wm/ext/old-window-menu.jl: Resurrected. It was removed in commit cf79775e. diff --git a/lisp/sawfish/wm/menus.jl b/lisp/sawfish/wm/menus.jl index a277229..ea5a08c 100644 --- a/lisp/sawfish/wm/menus.jl +++ b/lisp/sawfish/wm/menus.jl @@ -171,18 +171,18 @@ before killing it.") (define (add-poweroff-menu) "Add poweroff related menu items to Session sub-menu." - (require 'sawfish.wm.commands.poweroff) + (user-eval '(access-structures '(sawfish.wm.commands.poweroff))) (let ((menu (assoc (_ "Sessi_on") root-menu))) (when menu (nconc menu `(() (,(_ "_Reboot System") - (poweroff 'reboot)) + (sawfish.wm.commands.poweroff#poweroff 'reboot)) (,(_ "_Shutdown System") - (poweroff 'halt)) + (sawfish.wm.commands.poweroff#poweroff 'halt)) (,(_ "S_uspend System") - (poweroff 'suspend)) + (sawfish.wm.commands.poweroff#poweroff 'suspend)) (,(_ "_Hibernate System") - (poweroff 'hibernate))))))) + (sawfish.wm.commands.poweroff#poweroff 'hibernate))))))) (define (menu-start-process) (when menu-timer diff --git a/man/news.texi b/man/news.texi index c1f3899..4a34565 100644 --- a/man/news.texi +++ b/man/news.texi @@ -9,6 +9,14 @@ they occurred between. For more detailed information see the @file{ChangeLog} file in the Sawfish source tree, or git log. (See Wiki page on how to access git repository.) +...@heading 1.7.0.1 + +This version is a bugfix release of 1.7.0. + +The fixed bug is not a critical one, an error of poweroff commands in the +menu; In 1.7.0, power off related commands under Sawfish root menu -> +session cannot be invoked. + @heading 1.7.0 "Frozen Flame" @itemize @bullet -- 1.7.2.2
