From ed42faa2e62eb2a315eeb791f8d7ffbdbeb53d47 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Wed, 8 Mar 2017 11:22:27 +0100
Subject: [PATCH] Revert commit 36f08ab2c3f4da39355b23dc2eba112b327302e8.

---
 electrum              | 9 ++-------
 gui/qt/main_window.py | 2 +-
 lib/qrscanner.py      | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/electrum b/electrum
index 3a7087e4b..6c1691be7 100755
--- a/electrum
+++ b/electrum
@@ -90,16 +90,11 @@ if not is_android:
     check_imports()
 
 # load local module as electrum
-if is_local or is_android:
+if is_bundle or is_local or is_android:
     import imp
     imp.load_module('electrum', *imp.find_module('lib'))
     imp.load_module('electrum_gui', *imp.find_module('gui'))
 
-# for pyinstaller
-import electrum
-import electrum_gui
-import electrum_plugins
-
 from electrum import bitcoin, network
 from electrum import SimpleConfig, Network
 from electrum.wallet import Wallet, Imported_Wallet
@@ -298,7 +293,7 @@ def run_offline_command(config, config_options):
 
 def init_plugins(config, gui_name):
     from electrum.plugins import Plugins
-    return Plugins(config, is_local or is_android, gui_name)
+    return Plugins(config, is_bundle or is_local or is_android, gui_name)
 
 if __name__ == '__main__':
 
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 36f62ae33..a3213437e 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -2586,7 +2586,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
         choosers = sorted(coinchooser.COIN_CHOOSERS.keys())
         chooser_name = coinchooser.get_name(self.config)
         msg = _('Choose coin (UTXO) selection method.  The following are available:\n\n')
-        #msg += '\n\n'.join(fmt_docs(*item) for item in coinchooser.COIN_CHOOSERS.items())
+        msg += '\n\n'.join(fmt_docs(*item) for item in coinchooser.COIN_CHOOSERS.items())
         chooser_label = HelpLabel(_('Coin selection') + ':', msg)
         chooser_combo = QComboBox()
         chooser_combo.addItems(choosers)
diff --git a/lib/qrscanner.py b/lib/qrscanner.py
index 163dae29d..6a9c2d1b8 100644
--- a/lib/qrscanner.py
+++ b/lib/qrscanner.py
@@ -30,7 +30,7 @@ from ctypes import cdll, c_char_p
 if sys.platform == 'darwin':
     name = 'libzbar.dylib'
 elif sys.platform == 'windows':
-    name = 'libzbar-0.dll'
+    name = 'libzbar.dll'
 else:
     name = 'libzbar.so.0'