From 277c917b5376be63dc7502691e29499eae0656f0 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguel@cptibr.org>
Date: Thu, 31 Oct 2013 13:48:31 -0200
Subject: [PATCH] no use for setting/getting defaultuser, it just adds
 confusion.

---
 INSTALL            | 1 +
 src/bitcoinrpc.cpp | 2 --
 src/bitcoinrpc.h   | 2 --
 src/rpcwallet.cpp  | 6 +++++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index 7430335f..ccb1c4ae 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,6 +14,7 @@ libtorrent's.
 1) Start with libtorrent:
 
 $ cd libtorrent
+$ ./bootstrap.sh
 $ ./configure --enable-logging --enable-debug --enable-dht
 
 Note1: 64-bit systems may need "--with-boost-libdir=/usr/lib64"
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index b3c79f67..87690826 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -255,8 +255,6 @@ static const CRPCCommand vRPCCommands[] =
     { "getfollowing",           &getfollowing,           false,     true },
     { "getlasthave",            &getlasthave,            false,     true },
     { "listusernamespartial",   &listusernamespartial,   false,     true },
-    { "getdefaultuser",         &getdefaultuser,         false,     true },
-    { "setdefaultuser",         &setdefaultuser,         false,     true },
     { "rescandirectmsgs",       &rescandirectmsgs,       false,     true },
 };
 
diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h
index 071c6a72..28266de7 100644
--- a/src/bitcoinrpc.h
+++ b/src/bitcoinrpc.h
@@ -207,8 +207,6 @@ extern json_spirit::Value unfollow(const json_spirit::Array& params, bool fHelp)
 extern json_spirit::Value getfollowing(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value getlasthave(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value listusernamespartial(const json_spirit::Array& params, bool fHelp);
-extern json_spirit::Value getdefaultuser(const json_spirit::Array& params, bool fHelp);
-extern json_spirit::Value setdefaultuser(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value rescandirectmsgs(const json_spirit::Array& params, bool fHelp);
 
 #endif
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 7cde6dab..c611ba02 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -153,6 +153,10 @@ Value listwalletusers(const Array& params, bool fHelp)
     return ret;
 }
 
+/* [mf] no use for setting/getting defaultuser, it just adds confusion.
+   all commands should receive user as parameter (including the user for spammsg).
+*/
+#if 0
 Value setdefaultuser(const Array& params, bool fHelp)
 {
     if (fHelp || params.size() != 1)
@@ -199,7 +203,7 @@ Value getdefaultuser(const Array& params, bool fHelp)
 
     return username;
 }
-
+#endif
 
 Value signmessage(const Array& params, bool fHelp)
 {