[sawfish] "Poweroff" bugfix of 1.7.0.

[Christopher Bratusek <chrisb src gnome org>]

commit dc911b9b4f3ac431c14cda079cf8e09ae8e2314b
Author: Teika kazura <teika lavabit com>
Date:   Tue Oct 12 11:30:10 2010 +0900

    "Poweroff" bugfix of 1.7.0.
    
    In 1.7.0, poweroff related commands under root-menu -> session can't
    be invoked. This is fixed.
    ChangeLog.

 ChangeLog                |    5 +++++
 lisp/sawfish/wm/menus.jl |   10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6297838..aefd96a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-12  Teika kazura <teika lavabit com>
+	* lisp/sawfish/wm/menus.jl: "Poweroff" bugfix.
+	In 1.7.0, poweroff related commands under root-menu -> session can't
+	be invoked. This is fixed.
+
 2010-10-09  Teika kazura <teika lavabit com>
 	* lisp/sawfish/wm/integration/gnome.jl
 	* lisp/sawfish/wm/integration/kde.jl
diff --git a/lisp/sawfish/wm/menus.jl b/lisp/sawfish/wm/menus.jl
index 8aba5cd..6095753 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