git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
99f71a1
)
Merge branch 'master' of github.com:Spesmilo/Electrum
author
Amir Taaki
<genjix@riseup.net>
Fri, 3 Aug 2012 19:13:49 +0000 (16:13 -0300)
committer
Amir Taaki
<genjix@riseup.net>
Fri, 3 Aug 2012 19:13:49 +0000 (16:13 -0300)
lib/qrscanner.py
patch
|
blob
|
history
setup.py
patch
|
blob
|
history
diff --git
a/lib/qrscanner.py
b/lib/qrscanner.py
index
eb3571a
..
bbf11c5
100644
(file)
--- a/
lib/qrscanner.py
+++ b/
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():
diff --git
a/setup.py
b/setup.py
index
1af2662
..
770c59a
100644
(file)
--- a/
setup.py
+++ b/
setup.py
@@
-53,6
+53,7
@@
setup(name = "Electrum",
'electrum.icons_rc',
'electrum.mnemonic',
'electrum.pyqrnative',
+ 'electrum.qrscanner',
'electrum.bmp',
'electrum.msqr',
'electrum.util',