Merge branch 'master' of https://github.com/spesmilo/electrum

lib/gui_lite.py

@@ -283,12 +283,14 @@ class MiniWindow(QDialog):
         return quote_text
 
     def send(self):
-        if self.actuator.send(self.address_input.text(), self.amount_input.text(), self):
+        if self.actuator.send(self.address_input.text(),
+                              self.amount_input.text(), self):
             self.address_input.setText("")
             self.amount_input.setText("")
 
     def check_button_status(self):
-      if self.address_input.property("isValid") == True and len(self.amount_input.text()) != 0:
+      if (self.address_input.property("isValid") is True and
+          len(self.amount_input.text()) > 0):
         self.send_button.setDisabled(False)
       else:
         self.send_button.setDisabled(True)

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',