Merge branch 'master' of git://github.com/spesmilo/electrum
This commit is contained in:
commit
cf432db6e8
|
@ -787,7 +787,7 @@ class MiniActuator:
|
||||||
def set_configured_currency(self, set_quote_currency):
|
def set_configured_currency(self, set_quote_currency):
|
||||||
"""Set the inital fiat currency conversion country (USD/EUR/GBP) in
|
"""Set the inital fiat currency conversion country (USD/EUR/GBP) in
|
||||||
the GUI to what it was set to in the wallet."""
|
the GUI to what it was set to in the wallet."""
|
||||||
currency = self.wallet.config.get('conversion_currency')
|
currency = self.wallet.config.get('currency')
|
||||||
# currency can be none when Electrum is used for the first
|
# currency can be none when Electrum is used for the first
|
||||||
# time and no setting has been created yet.
|
# time and no setting has been created yet.
|
||||||
if currency is not None:
|
if currency is not None:
|
||||||
|
|
|
@ -50,7 +50,7 @@ register_command('dumpprivkeys', 0, 0, True, True, 'dump all private k
|
||||||
register_command('eval', 1, 1, False, True, 'Run python eval() on an object', 'eval <expression>\nExample: eval \"wallet.aliases\"')
|
register_command('eval', 1, 1, False, True, 'Run python eval() on an object', 'eval <expression>\nExample: eval \"wallet.aliases\"')
|
||||||
register_command('freeze', 1, 1, False, True, 'Freeze the funds at one of your wallet\'s addresses')
|
register_command('freeze', 1, 1, False, True, 'Freeze the funds at one of your wallet\'s addresses')
|
||||||
register_command('getbalance', 0, 1, False, False, 'Return the balance of your wallet, or of one account in your wallet', 'getbalance [<account>]')
|
register_command('getbalance', 0, 1, False, False, 'Return the balance of your wallet, or of one account in your wallet', 'getbalance [<account>]')
|
||||||
register_command('getaddressbalance', 0, 1, False, False, 'Return the balance of an address', 'getbalance <address>')
|
register_command('getaddressbalance', 1, 1, False, False, 'Return the balance of an address', 'getbalance <address>')
|
||||||
register_command('getaddresshistory', 1, 1, False, False, 'Return the transaction history of an address')
|
register_command('getaddresshistory', 1, 1, False, False, 'Return the transaction history of an address')
|
||||||
register_command('getconfig', 1, 1, False, True, 'Return a configuration variable', 'getconfig <name>')
|
register_command('getconfig', 1, 1, False, True, 'Return a configuration variable', 'getconfig <name>')
|
||||||
register_command('getseed', 0, 0, True, True, 'Print the generation seed of your wallet.')
|
register_command('getseed', 0, 0, True, True, 'Print the generation seed of your wallet.')
|
||||||
|
|
|
@ -113,7 +113,7 @@ def process_request(i, amount, confirmations, expires_in, password):
|
||||||
if password!=my_password:
|
if password!=my_password:
|
||||||
print "wrong password ", password
|
print "wrong password ", password
|
||||||
return
|
return
|
||||||
addr = wallet.get_new_address(i, 0)
|
addr = wallet.get_new_address(0, i, 0)
|
||||||
out_queue.put( ('request', (i, addr, amount, confirmations, expires_in) ))
|
out_queue.put( ('request', (i, addr, amount, confirmations, expires_in) ))
|
||||||
return addr
|
return addr
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue