Merge branch 'master' of github.com:Spesmilo/Electrum
This commit is contained in:
commit
da5571a870
|
@ -11,6 +11,14 @@ from urlparse import urlparse, parse_qs
|
||||||
def is_available():
|
def is_available():
|
||||||
if not zbar:
|
if not zbar:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
try:
|
||||||
|
proc = zbar.Processor()
|
||||||
|
proc.init()
|
||||||
|
except zbar.SystemError:
|
||||||
|
# Cannot open video device
|
||||||
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def scan_qr():
|
def scan_qr():
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -53,6 +53,7 @@ setup(name = "Electrum",
|
||||||
'electrum.icons_rc',
|
'electrum.icons_rc',
|
||||||
'electrum.mnemonic',
|
'electrum.mnemonic',
|
||||||
'electrum.pyqrnative',
|
'electrum.pyqrnative',
|
||||||
|
'electrum.qrscanner',
|
||||||
'electrum.bmp',
|
'electrum.bmp',
|
||||||
'electrum.msqr',
|
'electrum.msqr',
|
||||||
'electrum.util',
|
'electrum.util',
|
||||||
|
|
Loading…
Reference in New Issue