trjp_sawfish
Fork

Commit

Revision	cc9aa573714f3ae3a494e047cae14819268f266f (tree)
Time	2012-04-06 03:21:50
Author	Christopher Roy Bratusek <nano@tuxf...>
Commiter	Christopher Roy Bratusek

int-modules: check for XDG_CURRENT_DESKTOP

--- a/lisp/sawfish/wm/integration/gnome.jl

+++ b/lisp/sawfish/wm/integration/gnome.jl

		@@ -68,6 +68,7 @@
68	68	;; Returns nil if gnome is not found.
69	69	;; If detected, returns t, and do also gnome support init.
70	70	(define (detect-gnome)
71		- (when (getenv "GNOME_DESKTOP_SESSION_ID")
	71	+ (when (or (equal (getenv "XDG_CURRENT_DESKTOP") "GNOME")
	72	+ (getenv "GNOME_DESKTOP_SESSION_ID"))
72	73	(init)
73	74	t)))

--- a/lisp/sawfish/wm/integration/kde.jl

+++ b/lisp/sawfish/wm/integration/kde.jl

		@@ -80,11 +80,12 @@
80	80	(system "qdbus org.kde.kded /org/freedesktop/PowerManagement Suspend &"))
81	81	(,(_ "_Hibernate from KDE")
82	82	(system "qdbus org.kde.kded /org/freedesktop/PowerManagement Hibernate &")))))))
83		-
	83	+
84	84	;; Returns nil if kde is not found.
85	85	;; If detected, returns t, and do also kde support init.
86	86	(define (detect-kde)
87		- (when (getenv "KDE_FULL_SESSION")
	87	+ (when (or (equal (getenv "XDG_CURRENT_DESKTOP") KDE)
	88	+ (getenv "KDE_FULL_SESSION"))
88	89	(init)
89	90	t))
90	91

--- a/lisp/sawfish/wm/integration/mate.jl

+++ b/lisp/sawfish/wm/integration/mate.jl

		@@ -68,6 +68,7 @@
68	68	;; Returns nil if mate is not found.
69	69	;; If detected, returns t, and do also mate support init.
70	70	(define (detect-mate)
71		- (when (getenv "MATE_DESKTOP_SESSION_ID")
	71	+ (when (or (equal (getenv "XDG_CURRENT_DESKTOP") "MATE")
	72	+ (getenv "MATE_DESKTOP_SESSION_ID"))
72	73	(init)
73	74	t)))

--- a/lisp/sawfish/wm/integration/razor.jl

+++ b/lisp/sawfish/wm/integration/razor.jl

		@@ -80,7 +80,8 @@
80	80	;; Returns nil if razor is not found.
81	81	;; If detected, returns t, and do also razor support init.
82	82	(define (detect-razor)
83		- (when (or (equal (getenv "DESKTOP_SESSION") "razor")
	83	+ (when (or (equal (getenv "XDG_CURRENT_DESKTKOP") "Razor")
	84	+ (equal (getenv "DESKTOP_SESSION") "razor")
84	85	(get-window-by-class "Razor-desktop" #:regex t))
85	86	(init)
86	87	t)))

--- a/lisp/sawfish/wm/integration/xfce.jl

+++ b/lisp/sawfish/wm/integration/xfce.jl

		@@ -77,6 +77,7 @@
77	77	;; Returns nil if xfce is not found.
78	78	;; If detected, returns t, and do also xfce support init.
79	79	(define (detect-xfce)
80		- (when (get-x-property 'root '_DT_SAVE_MODE)
	80	+ (when (or (get-x-property 'root '_DT_SAVE_MODE)
	81	+ (equal (getenv "XDG_CURRENT_DESKTOP") "XFCE"))
81	82	(init)
82	83	t)))