diff options
author | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-08-22 14:10:50 -0400 |
commit | 6bae67c3e7c66af9e8ce1605070f7e92f247f0cb (patch) | |
tree | 64dc7e2588cc5c17fdb6c801877792f83cfcecf3 /src/leap/gui/__init__.py | |
parent | 00efccabb1eb6c3597282bc0e095cf2026f75a3b (diff) | |
parent | 00d98a47c60764475d97df1c2eb847e20a77cae5 (diff) |
Merge tag '0.3.0' into debian
Tag bitmask version 0.3.0
Conflicts:
.coveragerc
.tx/config
NEWS.rst
setup.cfg
src/leap/base/checks.py
src/leap/base/exceptions.py
src/leap/base/tests/test_checks.py
src/leap/eip/checks.py
src/leap/gui/firstrun/login.py
src/leap/gui/locale_rc.py
src/leap/util/polkit.py
tests/test_qt_environment.py
tox.ini
Diffstat (limited to 'src/leap/gui/__init__.py')
-rw-r--r-- | src/leap/gui/__init__.py | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/leap/gui/__init__.py b/src/leap/gui/__init__.py index 804bfbc1..4b289442 100644 --- a/src/leap/gui/__init__.py +++ b/src/leap/gui/__init__.py @@ -1,11 +1,21 @@ -try: - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) -except ValueError: - pass - -import firstrun -import firstrun.wizard - -__all__ = ['firstrun', 'firstrun.wizard'] +# -*- coding: utf-8 -*- +# __init__.py +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +""" +init file for leap.gui +""" +app = __import__("app", globals(), locals(), [], 2) +__all__ = [app] |