From 08ef8294df139693ee6d1c381e4569eb1db7142e Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Tue, 26 Jul 2016 19:09:57 +0300
Subject: [PATCH] os x and freebsd support (untested)

---
 setup.py                  | 23 +++++++++++++++--------
 toxygen/file_transfers.py |  7 +++----
 toxygen/settings.py       |  8 +++++---
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/setup.py b/setup.py
index 670538b..17468de 100644
--- a/setup.py
+++ b/setup.py
@@ -7,10 +7,15 @@ from toxygen.util import program_version
 
 version = program_version + '.0'
 
-MODULES = ['PyAudio']
+MODULES = []
 
-if system() == 'Windows':
-    MODULES.append('PySide')
+if system() in ('Windows', 'Darwin'):
+    MODULES = ['PyAudio', 'PySide']
+else:
+    try:
+        import pyaudio
+    except ImportError:
+        MODULES = ['PyAudio']
 
 
 class InstallScript(install):
@@ -18,11 +23,13 @@ class InstallScript(install):
 
     def run(self):
         install.run(self)
-        OS = system()
-        if OS == 'Windows':
-            call(["toxygen", "--configure"])
-        elif OS == 'Linux':
-            call(["toxygen", "--clean"])
+        try:
+            if system() == 'Windows':
+                call(["toxygen", "--configure"])
+            else:
+                call(["toxygen", "--clean"])
+        except:
+            pass
 
 setup(name='Toxygen',
       version=version,
diff --git a/toxygen/file_transfers.py b/toxygen/file_transfers.py
index 2c1f73e..f9bcdaf 100644
--- a/toxygen/file_transfers.py
+++ b/toxygen/file_transfers.py
@@ -8,6 +8,7 @@ try:
     from PySide import QtCore
 except ImportError:
     from PyQt4 import QtCore
+    QtCore.Signal = QtCore.pyqtSignal
 
 # TODO: threads!
 
@@ -34,10 +35,8 @@ ALLOWED_FILES = ('toxygen_inline.png', 'utox-inline.png', 'sticker.png')
 
 
 class StateSignal(QtCore.QObject):
-    try:
-        signal = QtCore.Signal(int, float, int)  # state and progress
-    except:
-        signal = QtCore.pyqtSignal(int, float, int)  # state and progress - pyqt4
+
+    signal = QtCore.Signal(int, float, int)  # state and progress
 
 
 class FileTransfer(QtCore.QObject):
diff --git a/toxygen/settings.py b/toxygen/settings.py
index c7d80f3..770f848 100644
--- a/toxygen/settings.py
+++ b/toxygen/settings.py
@@ -204,10 +204,12 @@ class Settings(dict, Singleton):
 
     @staticmethod
     def get_default_path():
-        if system() == 'Linux':
-            return os.getenv('HOME') + '/.config/tox/'
-        elif system() == 'Windows':
+        if system() == 'Windows':
             return os.getenv('APPDATA') + '/Tox/'
+        elif system() == 'Darwin':
+            return os.getenv('HOME') + '/Library/Application Support/Tox/'
+        else:
+            return os.getenv('HOME') + '/.config/tox/'
 
 
 class ProfileHelper(Singleton):