Try to figure the desktop type when launching a browser under X Window.

git-svn-id: svn://cherokee-project.com/cherokee/trunk@6108 5dc97367-97f1-0310-9951-d761b3857238
cherokee · Jan 14, 2011 · e8b20f0 · e8b20f0
1 parent f341a5b
commit e8b20f0
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/cherokee/cherokee-admin-launcher b/cherokee/cherokee-admin-launcher
@@ -81,9 +81,7 @@ def find_sudo_askpass():
         return askpass_bin
 
     # X-Window
-    X_display = os.getenv ("DISPLAY")
-    if X_display:
-        # GNOME
+    def check_gnome():
         gaskpass_bin = bin_in_path ('gaskpass')
         if gaskpass_bin:
             return gaskpass_bin
@@ -93,7 +91,7 @@ def find_sudo_askpass():
         if gnome_ssh_askpass_bin:
             return gnome_ssh_askpass_bin
 
-        # KDE
+    def check_kde():
         ksshaskpass_bin = bin_in_path ('ksshaskpass')
         if ksshaskpass_bin:
             return ksshaskpass_bin
@@ -102,6 +100,24 @@ def find_sudo_askpass():
         if kwalletaskpass_bin:
             return kwalletaskpass_bin
 
+    X_display = os.getenv ("DISPLAY")
+    if X_display:
+        ps = os.popen ("ps ax").read().lower()
+        procs_gnome = ps.count("gnome")
+        procs_kde   = ps.count("kde")
+
+        # GNOME and KDE
+        if procs_gnome > procs_kde:
+            bin = check_gnome()
+            if bin: return bin
+            bin = check_kde()
+            if bin: return bin
+        else:
+            bin = check_kde()
+            if bin: return bin
+            bin = check_gnome()
+            if bin: return bin
+
         # GTK+
         gtk_led_askpass_bin = bin_in_path ('gtk-led-askpass')
         if gtk_led_askpass_bin:
@@ -147,8 +163,6 @@ def run_as_root (cmd):
 
 
 class Admin_Runner (threading.Thread):
-#  launching_lock = threading.Lock()
-
    def __init__ (self, event_launched):
       threading.Thread.__init__ (self)
       self.daemon = True