From 6c525477d9e0a2b7335591c62200498155e1158b Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Thu, 3 Mar 2016 22:19:09 +0300
Subject: [PATCH] singleton fix

---
 src/menu.py    | 12 ++++++------
 src/profile.py |  2 +-
 src/util.py    | 12 ++++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/menu.py b/src/menu.py
index a99563e..fce30d7 100644
--- a/src/menu.py
+++ b/src/menu.py
@@ -215,7 +215,7 @@ class PrivacySettings(QtGui.QWidget):
         self.typingNotifications.setObjectName("typingNotifications")
 
         self.retranslateUi()
-        settings = Settings()
+        settings = Settings.get_instance()
         self.typingNotifications.setChecked(settings['typing_notifications'])
         self.fileautoaccept.setChecked(settings['allow_auto_accept'])
         self.saveHistory.setChecked(settings['save_history'])
@@ -228,7 +228,7 @@ class PrivacySettings(QtGui.QWidget):
         self.typingNotifications.setText(QtGui.QApplication.translate("privacySettings", "Send typing notifications", None, QtGui.QApplication.UnicodeUTF8))
 
     def closeEvent(self, event):
-        settings = Settings()
+        settings = Settings.get_instance()
         settings['typing_notifications'] = self.typingNotifications.isChecked()
         settings['allow_auto_accept'] = self.fileautoaccept.isChecked()
         settings['save_history'] = self.saveHistory.isChecked()
@@ -257,7 +257,7 @@ class NotificationsSettings(QtGui.QWidget):
         self.callsSound = QtGui.QCheckBox(self)
         self.callsSound.setGeometry(QtCore.QRect(30, 60, 231, 22))
         self.callsSound.setObjectName("checkBox_3")
-        s = Settings()
+        s = Settings.get_instance()
         self.enableNotifications.setChecked(s['notifications'])
         self.soundNotifications.setChecked(s['sound_notifications'])
         self.callsSound.setChecked(s['calls_sound'])
@@ -271,7 +271,7 @@ class NotificationsSettings(QtGui.QWidget):
         self.callsSound.setText(QtGui.QApplication.translate("notificationsForm", "Enable sound notifications", None, QtGui.QApplication.UnicodeUTF8))
 
     def closeEvent(self, *args, **kwargs):
-        settings = Settings()
+        settings = Settings.get_instance()
         settings['notifications'] = self.enableNotifications.isChecked()
         settings['sound_notifications'] = self.soundNotifications.isChecked()
         settings['calls_sound'] = self.callsSound.isChecked()
@@ -307,7 +307,7 @@ class InterfaceSettings(QtGui.QWidget):
         self.themeSelect.setObjectName("themeSelect")
         list_of_themes = ['default', 'windows', 'gtk', 'cde', 'plastique', 'motif']
         self.themeSelect.addItems(list_of_themes)
-        theme = Settings()['theme']
+        theme = Settings.get_instance()['theme']
         index = list_of_themes.index(theme)
         self.themeSelect.setCurrentIndex(index)
         self.retranslateUi()
@@ -318,7 +318,7 @@ class InterfaceSettings(QtGui.QWidget):
         self.label.setText(QtGui.QApplication.translate("interfaceForm", "Theme:", None, QtGui.QApplication.UnicodeUTF8))
 
     def closeEvent(self, event):
-        settings = Settings()
+        settings = Settings.get_instance()
         style = str(self.themeSelect.currentText())
         settings['theme'] = style
         settings.save()
diff --git a/src/profile.py b/src/profile.py
index a6b2fea..2d24996 100644
--- a/src/profile.py
+++ b/src/profile.py
@@ -141,7 +141,7 @@ class Profile(Contact):
         self._name = tox.self_get_name()
         self._status_message = tox.self_get_status_message()
         self._status = None
-        self.show_online = Settings()['show_online_friends']
+        self.show_online = Settings.get_instance()['show_online_friends']
         data = tox.self_get_friend_list()
         self._friends, num, self._active_friend = [], 0, -1
         for i in data:
diff --git a/src/util.py b/src/util.py
index 0504f56..338ddf1 100644
--- a/src/util.py
+++ b/src/util.py
@@ -31,7 +31,11 @@ def get_style(style):
 
 class Singleton(object):
 
-    def __new__(cls, *args):
-        if not hasattr(cls, 'instance'):
-            cls.instance = super(Singleton, cls,).__new__(cls, *args)
-        return cls.instance
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, '_instance'):
+            cls._instance = super(Singleton, cls).__new__(cls, *args, **kwargs)
+        return cls._instance
+
+    @classmethod
+    def get_instance(cls):
+        return cls._instance