From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 4 Apr 2012 19:43:29 +0000 (-0400)
Subject: Merge branch '0.5.x' into 0.6.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~28
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=fe1725a141334dab82ca007fb6fc983c358e35b2

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/bitcoinrpc.cpp
---

fe1725a141334dab82ca007fb6fc983c358e35b2
diff --cc src/bitcoinrpc.cpp
index d8b9782,f10de69..a246677
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@@ -2371,8 -2174,8 +2371,8 @@@ void ThreadRPCServer2(void* parg
              strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
          else if (mapArgs.count("-daemon"))
              strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
-         ::error(
+         ThreadSafeMessageBox(strprintf(
 -            _("Error: %s, you must set a rpcpassword in the configuration file:\n %s\n"
 +            _("%s, you must set a rpcpassword in the configuration file:\n %s\n"
                "It is recommended you use the following random password:\n"
                "rpcuser=bitcoinrpc\n"
                "rpcpassword=%s\n"