diff options
| -rw-r--r-- | changes/bug_use_bitmask_icon_mac | 2 | ||||
| -rw-r--r-- | changes/feature_display_domain_instead_of_provider_name | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/darwinvpnlauncher.py | 2 |
4 files changed, 6 insertions, 2 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/changes/feature_display_domain_instead_of_provider_name b/changes/feature_display_domain_instead_of_provider_name new file mode 100644 index 00000000..0b2c42a6 --- /dev/null +++ b/changes/feature_display_domain_instead_of_provider_name @@ -0,0 +1,2 @@ +- Display domain for provider the user has just logged in. Fixes + #4631.
\ No newline at end of file diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 7dcb9908..96aa8074 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1015,7 +1015,7 @@ class MainWindow(QtGui.QMainWindow): """ self._login_widget.logged_in() - self.ui.lblLoginProvider.setText(self._provider_config.get_name()) + self.ui.lblLoginProvider.setText(self._provider_config.get_domain()) self._enabled_services = self._settings.get_enabled_services( self._provider_config.get_domain()) 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): |