electrum

commit 69ca6a3074206cb778f248d4fad88c436f3f1578
parent 0fc0bdd667559da3b6bb6b58018de56ecbdfa94f
Author: thomasv <thomasv@gitorious>
Date:   Mon, 12 Mar 2012 17:55:59 +0100

Merge branch 'master' of git://gitorious.org/electrum/electrum

Diffstat:
M
client/MANIFEST.in
 | 
1
+
M
client/electrum
 | 
2
+-
M
client/remote_wallet.py
 | 
2
+-

3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/client/MANIFEST.in b/client/MANIFEST.in
@@ -5,4 +5,5 @@ exclude setup.py
 recursive-include ecdsa *.py
 recursive-include aes *.py
 include icons.qrc
+include remote.php
 recursive-include icons *
diff --git a/client/electrum b/client/electrum
@@ -93,7 +93,7 @@ if __name__ == '__main__':
 
     if not wallet.file_exists and cmd not in ['help','create','restore']:
         print "Wallet file not found."
-        print "Type 'electrum.py create' to create a new wallet, or provide a path to a wallet with the -d option"
+        print "Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option"
         sys.exit(0)
     
     if cmd in ['create', 'restore']:
diff --git a/client/remote_wallet.py b/client/remote_wallet.py
@@ -86,7 +86,7 @@ if __name__ == '__main__':
 
     if len(sys.argv)>1:
         import jsonrpclib
-        server = jsonrpclib.Server('http://%s:%d'%(host,port))
+        server = jsonrpclib.Server('http://%s:%s@%s:%d'%(username, password, host, port))
         cmd = sys.argv[1]
 
         try: