From 4da5d2ef7a6671c6f7f83a290c52441da5ac9873 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 4 Sep 2013 17:14:17 +0200
Subject: warn user if python3 is used to run setup

---
 changes/bug_3711-warn-with-python3 |  1 +
 setup.py                           | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 changes/bug_3711-warn-with-python3

diff --git a/changes/bug_3711-warn-with-python3 b/changes/bug_3711-warn-with-python3
new file mode 100644
index 00000000..79271caf
--- /dev/null
+++ b/changes/bug_3711-warn-with-python3
@@ -0,0 +1 @@
+  o Complain if setup.py is run with python3. Closes: #3711
diff --git a/setup.py b/setup.py
index 7f2a5011..5099c1b1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,33 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+# setup.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/>.
+"""
+Setup file for bitmask.
+"""
 
 from __future__ import print_function
 
 import sys
 
+if not sys.version_info[0] == 2:
+    print("[ERROR] Sorry, Python 3 is not supported (yet). "
+          "Try running with python2: python2 setup.py ...")
+    exit()
+
 try:
     from setuptools import setup, find_packages
 except ImportError:
-- 
cgit v1.2.3


From 845d70c8efb70478cb19fcc88e0c7958ee75370c Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 2 Sep 2013 17:39:22 -0300
Subject: Fix save log dialog freezing. Closes #3675.

Avoid using native dialog seems to solve the QFileDialog freezing when
qtreactor is used.
See more at: http://www.code-corner.de/?p=171
---
 changes/bug-3675_qfiledialog-and-qtreactor-freezes | 1 +
 src/leap/bitmask/gui/loggerwindow.py               | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug-3675_qfiledialog-and-qtreactor-freezes

diff --git a/changes/bug-3675_qfiledialog-and-qtreactor-freezes b/changes/bug-3675_qfiledialog-and-qtreactor-freezes
new file mode 100644
index 00000000..fa0ef6a2
--- /dev/null
+++ b/changes/bug-3675_qfiledialog-and-qtreactor-freezes
@@ -0,0 +1 @@
+  o Fix save logs to file dialog freezing. Closes #3675.
diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py
index 9b4ba55d..ece4cad6 100644
--- a/src/leap/bitmask/gui/loggerwindow.py
+++ b/src/leap/bitmask/gui/loggerwindow.py
@@ -146,7 +146,8 @@ class LoggerWindow(QtGui.QDialog):
         Lets the user save the current log to a file
         """
         fileName, filtr = QtGui.QFileDialog.getSaveFileName(
-            self, self.tr("Save As"))
+            self, self.tr("Save As"),
+            options=QtGui.QFileDialog.DontUseNativeDialog)
 
         if fileName:
             try:
-- 
cgit v1.2.3