summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-12-19 17:01:55 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-12-19 17:01:55 -0300
commitaa1ff30f663edfd50002743acd0fa60480cd3d66 (patch)
treedd66502ac72d9959a12b2b0aec511ed7e9854a39
parentcd3250d20a60ab6ec5654bba8ec35e6d12cce03f (diff)
parentd054554649ccc4c25599046dafe6427a19797891 (diff)
Merge remote-tracking branch 'chiiph/bug/use_bitmask_icon_mac' into develop
-rw-r--r--changes/bug_use_bitmask_icon_mac2
-rw-r--r--src/leap/bitmask/services/eip/darwinvpnlauncher.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/bug_use_bitmask_icon_mac b/changes/bug_use_bitmask_icon_mac
new file mode 100644
index 00000000..d9015466
--- /dev/null
+++ b/changes/bug_use_bitmask_icon_mac
@@ -0,0 +1,2 @@
+- Use Bitmask icon instead of LEAP's for the super user dialog in
+ OSX. Fixes #4273. \ No newline at end of file
diff --git a/src/leap/bitmask/services/eip/darwinvpnlauncher.py b/src/leap/bitmask/services/eip/darwinvpnlauncher.py
index fe3fe4c1..a03bfc44 100644
--- a/src/leap/bitmask/services/eip/darwinvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/darwinvpnlauncher.py
@@ -95,7 +95,7 @@ class DarwinVPNLauncher(VPNLauncher):
resources_path = os.path.abspath(
os.path.join(os.getcwd(), "../../Contents/Resources"))
- return os.path.join(resources_path, "leap-client.tiff")
+ return os.path.join(resources_path, "bitmask.tiff")
@classmethod
def get_cocoasudo_ovpn_cmd(kls):