diff options
author | kali <kali@leap.se> | 2012-12-12 04:26:16 +0900 |
---|---|---|
committer | kali <kali@leap.se> | 2012-12-12 04:26:16 +0900 |
commit | b262ac8bae66c391aa249e93268db9935f1c475f (patch) | |
tree | 3d39b48495fbcfbfeab776af07558c345f4161cb /src/leap/baseapp/mainwindow.py | |
parent | cd78d9d552977e8f8fb12b6a2ff56fda9c37bf35 (diff) | |
parent | 04d423e2a89034dfb86fe305108162fd2a696079 (diff) |
Merge branch 'feature/openvpn-ciphers' into develop
Diffstat (limited to 'src/leap/baseapp/mainwindow.py')
-rw-r--r-- | src/leap/baseapp/mainwindow.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py index 8d61bf5c..65c30bff 100644 --- a/src/leap/baseapp/mainwindow.py +++ b/src/leap/baseapp/mainwindow.py @@ -61,10 +61,15 @@ class LeapWindow(QtGui.QMainWindow, logger.debug('provider: %s', self.provider_domain) logger.debug('eip_username: %s', self.eip_username) + provider = self.provider_domain EIPConductorAppMixin.__init__( - self, opts=opts, provider=self.provider_domain) + self, opts=opts, provider=provider) StatusAwareTrayIconMixin.__init__(self) - NetworkCheckerAppMixin.__init__(self) + + # XXX network checker should probably not + # trigger run_checks on init... but wait + # for ready signal instead... + NetworkCheckerAppMixin.__init__(self, provider=provider) MainWindowMixin.__init__(self) geom_key = "DebugGeometry" if self.debugmode else "Geometry" |