actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)

1 files changed, 21 insertions, 0 deletions

diff --git a/src/leap/gui/threads.py b/src/leap/gui/threads.py
new file mode 100644
index 00000000..8aad8866
--- /dev/null
+++ b/src/leap/gui/threads.py
@@ -0,0 +1,21 @@
+from PyQt4 import QtCore
+
+
+class FunThread(QtCore.QThread):
+
+    def __init__(self, fun=None, parent=None):
+
+        QtCore.QThread.__init__(self, parent)
+        self.exiting = False
+        self.fun = fun
+
+    def __del__(self):
+        self.exiting = True
+        self.wait()
+
+    def run(self):
+        if self.fun:
+            self.fun()
+
+    def begin(self):
+        self.start()