[sawfish] changed position of user-level initialization
- From: Christopher Bratusek <chrisb src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [sawfish] changed position of user-level initialization
- Date: Sat, 29 Aug 2009 16:25:41 +0000 (UTC)
commit 379750f67d7227499a93b35dfa8c138d4ca5606f
Author: chrisb <zanghar freenet de>
Date: Sat Aug 29 18:24:40 2009 +0200
changed position of user-level initialization
lisp/sawfish/wm.jl | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/lisp/sawfish/wm.jl b/lisp/sawfish/wm.jl
index 0eec70c..735a69f 100644
--- a/lisp/sawfish/wm.jl
+++ b/lisp/sawfish/wm.jl
@@ -38,6 +38,7 @@
(setenv "DISPLAY" display-name)
;; load i18n support when necessary
+
(unless batch-mode
(let ((lang (or (getenv "LANGUAGE") (getenv "LC_ALL")
(getenv "LC_MESSAGES") (getenv "LANG")))
@@ -149,14 +150,14 @@
(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 (or (get-command-line-option "--sm-client-id" t)
;; may be passed through from the default GNOME session
(get-command-line-option "-clientId" t)))
(session-prefix (get-command-line-option "--sm-prefix" t)))
- ;; do user-level initialization
- (load "sawfish/wm/user")
-
;; now connect with the session manager; gsm requires that apps don't
;; connect until they're ready to handle the later priority levels
(when (and (not batch-mode) (getenv "SESSION_MANAGER"))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]