diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-06-19 12:51:11 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-06-19 12:51:11 -0300 |
| commit | b4c26d2b6bf0d84e723d5e7b36042c67a75f268b (patch) | |
| tree | 0c3c8821085b4696d3503bad637ae8994186d7e1 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 4ff7ef29b06b6609c3fbb75ef6a17f500b106025 (diff) | |
| parent | d183a864b11a4f6d0d30200126281dd81ccf3c38 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/split-backend-components' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 03c29d0e..11b9acf1 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -42,7 +42,7 @@ from leap.bitmask.gui import twisted_main from leap.bitmask.platform_init import IS_WIN, IS_MAC, IS_LINUX from leap.bitmask.platform_init.initializers import init_platform -from leap.bitmask import backend +from leap.bitmask.backend import leapbackend from leap.bitmask.services.eip import conductor as eip_conductor from leap.bitmask.services.mail import conductor as mail_conductor @@ -118,7 +118,7 @@ class MainWindow(QtGui.QMainWindow): self.ui = Ui_MainWindow() self.ui.setupUi(self) self.menuBar().setNativeMenuBar(not IS_LINUX) - self._backend = backend.Backend(bypass_checks) + self._backend = leapbackend.Backend(bypass_checks) self._backend.start() self._settings = LeapSettings() |