From 5adb10e4d2229a9ac7e3d8ec271e36fcf24ab516 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Sat, 15 Nov 2014 14:43:48 +0100
Subject: [PATCH] simplification

---
 gui/qt/__init__.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
index 06999a93..d5d2b061 100644
--- a/gui/qt/__init__.py
+++ b/gui/qt/__init__.py
@@ -154,7 +154,6 @@ class ElectrumGui:
             try:
                 wallet = Wallet(storage)
             except BaseException as e:
-                traceback.print_exc(file=sys.stdout)
                 QMessageBox.warning(None, _('Warning'), str(e), _('OK'))
                 return
             action = wallet.get_action()
@@ -171,16 +170,13 @@ class ElectrumGui:
             wallet.start_threads(self.network)
 
         # init tray
-        if 1:
-            self.dark_icon = self.config.get("dark_icon", False)
-            icon = QIcon(":icons/electrum_dark_icon.png") if self.dark_icon else QIcon(':icons/electrum_light_icon.png')
-            self.tray = QSystemTrayIcon(icon, None)
-            self.tray.setToolTip('Electrum')
-            self.tray.activated.connect(self.tray_activated)
-            self.build_tray_menu()
-            self.tray.show()
-        else:
-            self.tray = None
+        self.dark_icon = self.config.get("dark_icon", False)
+        icon = QIcon(":icons/electrum_dark_icon.png") if self.dark_icon else QIcon(':icons/electrum_light_icon.png')
+        self.tray = QSystemTrayIcon(icon, None)
+        self.tray.setToolTip('Electrum')
+        self.tray.activated.connect(self.tray_activated)
+        self.build_tray_menu()
+        self.tray.show()
 
         # main window
         self.main_window = w = ElectrumWindow(self.config, self.network, self)