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

1 files changed, 60 insertions, 0 deletions

diff --git a/src/leap/gui/twisted_main.py b/src/leap/gui/twisted_main.py
new file mode 100644
index 00000000..c7add3ee
--- /dev/null
+++ b/src/leap/gui/twisted_main.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+# twisted_main.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/>.
+"""
+Main functions for integration of twisted reactor
+"""
+import logging
+
+from twisted.internet import error
+
+# Resist the temptation of putting the import reactor here,
+# it will raise an "reactor already imported" error.
+
+logger = logging.getLogger(__name__)
+
+
+def start(app):
+    """
+    Start the mainloop.
+
+    :param app: the main qt QApplication instance.
+    :type app: QtCore.QApplication
+    """
+    from twisted.internet import reactor
+    logger.debug('starting twisted reactor')
+
+    # this seems to be troublesome under some
+    # unidentified settings.
+    #reactor.run()
+
+    reactor.runReturn()
+    app.exec_()
+
+
+def quit(app):
+    """
+    Stop the mainloop.
+
+    :param app: the main qt QApplication instance.
+    :type app: QtCore.QApplication
+    """
+    from twisted.internet import reactor
+    logger.debug('stopping twisted reactor')
+    try:
+        reactor.stop()
+    except error.ReactorNotRunning:
+        logger.debug('reactor not running')