summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-06-05 10:23:44 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-06-05 11:01:11 -0300
commit6e19fd7c55ae1c4520536cb272b1ffcb6e8abd4c (patch)
treeeb4ba10164491e8706a0300a5405d73cef073b01 /src/leap
parent82e1c4b1e3e5dd49b6e868732451a744ba37ba59 (diff)
Add support for gnome-shell polkit agent.
The gnome-shell desktop does not uses a separate process as others do. It uses an agent within its own process so we need to check for gnome-shell and then assume that its polkit is working.
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/services/eip/linuxvpnlauncher.py15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
index 1f0813e0..54845a8a 100644
--- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
@@ -71,7 +71,20 @@ def _is_auth_agent_running():
'ps aux | grep "[l]xpolkit"'
]
is_running = [commands.getoutput(cmd) for cmd in polkit_options]
- return any(is_running)
+
+ # gnome-shell does not uses a separate process for the polkit-agent, it
+ # uses a polkit-agent within its own process so we can't ps-grep it.
+ is_running = any(is_running)
+ if not is_running:
+ is_gnome_shell = commands.getoutput('ps aux | grep [g]nome-shell')
+
+ # $DESKTOP_SESSION == 'gnome' -> gnome-shell
+ # $DESKTOP_SESSION == 'gnome-fallback' -> gnome-shell fallback mode,
+ # uses polkit-gnome...
+ if is_gnome_shell and os.getenv("DESKTOP_SESSION") == 'gnome':
+ is_running = True
+
+ return is_running
def _try_to_launch_agent():