Merge branch 'master' of github.com:Spesmilo/Electrum

lib/qrscanner.py

@@ -11,6 +11,14 @@ from urlparse import urlparse, parse_qs
 def is_available():
     if not zbar:
         return False
+
+    try:
+        proc = zbar.Processor()
+        proc.init()
+    except zbar.SystemError:
+        # Cannot open video device
+        return False
+
     return True
 
 def scan_qr():

setup.py

@@ -53,6 +53,7 @@ setup(name = "Electrum",
                   'electrum.icons_rc',
                   'electrum.mnemonic',
                   'electrum.pyqrnative',
+                  'electrum.qrscanner',
                   'electrum.bmp',
                   'electrum.msqr',
                   'electrum.util',