From e54a746a5795ed498a8f8e2883f5a62eb7c106d2 Mon Sep 17 00:00:00 2001
From: thomasv <thomasv@gitorious>
Date: Mon, 30 Sep 2013 10:30:43 +0200
Subject: [PATCH] path of icons_rc

---
 gui/qt/__init__.py    |    2 +-
 gui/qt/main_window.py |   11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
index 520a890..f0283a5 100644
--- a/gui/qt/__init__.py
+++ b/gui/qt/__init__.py
@@ -40,7 +40,7 @@ from electrum.bitcoin import MIN_RELAY_TX_FEE
 try:
     import icons_rc
 except:
-    sys.exit("Error: Could not import icons_rc.py, please generate it with: 'pyrcc4 icons.qrc -o gui/gui_classic/icons_rc.py'")
+    sys.exit("Error: Could not import icons_rc.py, please generate it with: 'pyrcc4 icons.qrc -o gui/qt/icons_rc.py'")
 
 from util import *
 from main_window import ElectrumWindow
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index e348344..f4ddd77 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -24,11 +24,7 @@ import shutil
 import StringIO
 
 
-try:
-    import PyQt4
-except:
-    sys.exit("Error: Could not import PyQt4 on Linux systems, you may try 'sudo apt-get install python-qt4'")
-
+import PyQt4
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
@@ -36,10 +32,7 @@ import PyQt4.QtCore as QtCore
 from electrum.bitcoin import MIN_RELAY_TX_FEE, is_valid
 from electrum.plugins import run_hook
 
-try:
-    import icons_rc
-except:
-    sys.exit("Error: Could not import icons_rc.py, please generate it with: 'pyrcc4 icons.qrc -o gui/icons_rc.py'")
+import icons_rc
 
 from electrum.wallet import format_satoshis
 from electrum import Transaction
-- 
1.7.1