Commit: cc9aa573714f3ae3a494e047cae14819268f266f - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revisão: cc9aa573714f3ae3a494e047cae14819268f266f (tree)
• Hora: 2012-04-06 03:21:50
• Autor: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Mensagem de Log

int-modules: check for XDG_CURRENT_DESKTOP

Mudança Sumário

• modified: lisp/sawfish/wm/integration/gnome.jl
• modified: lisp/sawfish/wm/integration/kde.jl
• modified: lisp/sawfish/wm/integration/mate.jl
• modified: lisp/sawfish/wm/integration/razor.jl
• modified: lisp/sawfish/wm/integration/xfce.jl

Diff

--- a/lisp/sawfish/wm/integration/gnome.jl
+++ b/lisp/sawfish/wm/integration/gnome.jl
@@ -68,6 +68,7 @@
   ;; Returns nil if gnome is not found.
   ;; If detected, returns t, and do also gnome support init.
   (define (detect-gnome)
-    (when (getenv "GNOME_DESKTOP_SESSION_ID")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") "GNOME")
+              (getenv "GNOME_DESKTOP_SESSION_ID"))
       (init)
       t)))

--- a/lisp/sawfish/wm/integration/kde.jl
+++ b/lisp/sawfish/wm/integration/kde.jl
@@ -80,11 +80,12 @@
 			(system "qdbus org.kde.kded /org/freedesktop/PowerManagement Suspend &"))
 		      (,(_ "_Hibernate from KDE")
 			(system "qdbus org.kde.kded /org/freedesktop/PowerManagement Hibernate &")))))))
-  
+
   ;; Returns nil if kde is not found.
   ;; If detected, returns t, and do also kde support init.
   (define (detect-kde)
-    (when (getenv "KDE_FULL_SESSION")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") KDE)
+              (getenv "KDE_FULL_SESSION"))
       (init)
       t))
 

--- a/lisp/sawfish/wm/integration/mate.jl
+++ b/lisp/sawfish/wm/integration/mate.jl
@@ -68,6 +68,7 @@
   ;; Returns nil if mate is not found.
   ;; If detected, returns t, and do also mate support init.
   (define (detect-mate)
-    (when (getenv "MATE_DESKTOP_SESSION_ID")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") "MATE")
+              (getenv "MATE_DESKTOP_SESSION_ID"))
       (init)
       t)))

--- a/lisp/sawfish/wm/integration/razor.jl
+++ b/lisp/sawfish/wm/integration/razor.jl
@@ -80,7 +80,8 @@
   ;; Returns nil if razor is not found.
   ;; If detected, returns t, and do also razor support init.
   (define (detect-razor)
-    (when (or (equal (getenv "DESKTOP_SESSION") "razor")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTKOP") "Razor")
+	      (equal (getenv "DESKTOP_SESSION") "razor")
 	      (get-window-by-class "Razor-desktop" #:regex t))
       (init)
       t)))

--- a/lisp/sawfish/wm/integration/xfce.jl
+++ b/lisp/sawfish/wm/integration/xfce.jl
@@ -77,6 +77,7 @@
   ;; Returns nil if xfce is not found.
   ;; If detected, returns t, and do also xfce support init.
   (define (detect-xfce)
-    (when (get-x-property 'root '_DT_SAVE_MODE)
+    (when (or (get-x-property 'root '_DT_SAVE_MODE)
+              (equal (getenv "XDG_CURRENT_DESKTOP") "XFCE"))
       (init)
       t)))