Refix for Guake#517

Signed-off-by: Gaetan Semet <[email protected]>
gsemet · May 4, 2015 · 5d11204 · 5d11204
1 parent 9221561
commit 5d11204
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/guake/guake_app.py b/src/guake/guake_app.py
@@ -681,17 +681,15 @@ def get_final_window_monitor(self):
 
     def is_using_unity(self):
         linux_distrib = platform.linux_distribution()
-        if linux_distrib[0].lower() == "ubuntu":
-            if float(linux_distrib[1]) - 0.01 >= 15.04:
-                if os.environ.get('DESKTOP_SESSION').lower() == "ubuntu":
-                    return True
-                elif os.environ.get('DESKTOP_SESSION').lower() == "gnome":  # gnome shell
-                    return False
-                elif os.environ.get('DESKTOP_SESSION').lower() == "mate":  # gnome Mate
-                    return False
-                elif os.environ.get('DESKTOP_SESSION').lower() == "lubuntu":  # gnome Lubuntu
-                    return False
-            elif os.environ.get('DESKTOP_SESSION').lower() == "ubuntu":
+        if linux_distrib[0].lower() != "ubuntu":
+            return False
+
+        # http://askubuntu.com/questions/70296/is-there-an-environment-variable-that-is-set-for-unity
+        if float(linux_distrib[1]) - 0.01 <= 11.10:
+            if os.environ.get('DESKTOP_SESSION').lower() == "gnome".lower():
+                return True
+        else:
+            if os.environ.get('XDG_CURRENT_DESKTOP').lower() == "unity".lower():
                 return True
         return False