Merge branch 'release-0.3.3'0.3.3

Conflicts:
	pkg/requirements.pip
	setup.py
	src/leap/bitmask/config/leapsettings.py

1 files changed, 4 insertions, 12 deletions

diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py
index 1becfb18..2d17f6c2 100644
--- a/src/leap/bitmask/gui/preferenceswindow.py
+++ b/src/leap/bitmask/gui/preferenceswindow.py
@@ -24,6 +24,7 @@ import logging
 from functools import partial
 from PySide import QtCore, QtGui
 
+from leap.bitmask.config.leapsettings import LeapSettings
 from leap.bitmask.gui.ui_preferences import Ui_Preferences
 from leap.soledad.client import NoStorageSecret
 from leap.bitmask.crypto.srpauth import SRPAuthBadPassword
@@ -40,26 +41,18 @@ class PreferencesWindow(QtGui.QDialog):
     """
     Window that displays the preferences.
     """
-
-    WEAK_PASSWORDS = ("123456", "qweasd", "qwerty", "password")
-
-    def __init__(self, parent, srp_auth, leap_settings, standalone):
+    def __init__(self, parent, srp_auth):
         """
         :param parent: parent object of the PreferencesWindow.
         :parent type: QWidget
         :param srp_auth: SRPAuth object configured in the main app.
         :type srp_auth: SRPAuth
-        :param standalone: If True, the application is running as standalone
-                           and the preferences dialog should display some
-                           messages according to this.
-        :type standalone: bool
         """
         QtGui.QDialog.__init__(self, parent)
         self.AUTOMATIC_GATEWAY_LABEL = self.tr("Automatic")
 
         self._srp_auth = srp_auth
-        self._settings = leap_settings
-        self._standalone = standalone
+        self._settings = LeapSettings()
         self._soledad = None
 
         # Load UI
@@ -325,8 +318,7 @@ class PreferencesWindow(QtGui.QDialog):
         for service in services:
             try:
                 checkbox = QtGui.QCheckBox(self)
-                service_label = get_service_display_name(
-                    service, self._standalone)
+                service_label = get_service_display_name(service)
                 checkbox.setText(service_label)
 
                 self.ui.vlServices.addWidget(checkbox)