[sawfish] revert commit 379750f67d7227499a93b35dfa8c138d4ca5606f

[Christopher Bratusek <chrisb src gnome org>]

commit bb72cd65a1beb35b9ce2a087eca62be7051cdca9
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Fri Aug 13 20:58:04 2010 +0200

    revert commit 379750f67d7227499a93b35dfa8c138d4ca5606f

 ChangeLog          |    3 +++
 lisp/sawfish/wm.jl |    6 +++---
 man/news.texi      |    3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5aaedde..75a7d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* lisp/sawfish/wm/ext/edge-flip.jl: make edge-flipping work after
 	resolution-change
 
+	* lisp/sawfish/wm.jl: revert commit 379750f67d7227499a93b35dfa8c138d4ca5606f
+	fixes sawfish not starting up when receiving a session-id
+
 2010-08-13  Jeremy Hankins <nowan nowan org>
 	* lisp/sawfish/wm/viewport.jl: Fixed viewport init bug.
 
diff --git a/lisp/sawfish/wm.jl b/lisp/sawfish/wm.jl
index 8c383eb..81c2def 100644
--- a/lisp/sawfish/wm.jl
+++ b/lisp/sawfish/wm.jl
@@ -149,9 +149,6 @@
   (sawfish-load-all "sawfish/wm/autoload")
   (sawfish-load-all (concat "os-" (symbol-name operating-system))))
 
-;; do user-level initialization
-(load "sawfish/wm/user")
-
 (let ((session-id     (get-command-line-option "--sm-client-id" t))
       (session-prefix (get-command-line-option "--sm-prefix" t)))
 
@@ -159,3 +156,6 @@
   ;; connect until they're ready to handle the later priority levels
   (when (and (not batch-mode) (getenv "SESSION_MANAGER"))
     (sm-init session-id session-prefix)))
+
+;; do user-level initialization
+(load "sawfish/wm/user")
diff --git a/man/news.texi b/man/news.texi
index b7d430e..e738446 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -68,6 +68,9 @@ Function @code{x-atom-name} now accepts all 32 bits. Previously only
 They're @code{workspace-boundary-mode} and @code{workspace-send-boundary-mode}.
 
 @item Edge-Flip now works after resolution-change. [Christopher Bratusek]
+
+ item Sawfish now starts up correctly when receiving a session-id or
+session-prefix from GNOME-Session [Christopher Bratusek]
 @end itemize
 
 @item New Features