Guest User

Diff Tenebrix (debian build)

a guest
Oct 1st, 2011
97
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/src/headers.h b/src/headers.h
  2. index 02dba30..1093bf2 100644
  3. --- a/src/headers.h
  4. +++ b/src/headers.h
  5. @@ -26,8 +26,8 @@
  6.  #define BSD 1
  7.  #endif
  8.  #endif
  9. -#ifdef GUI
  10.  #include <wx/wx.h>
  11. +#ifdef GUI
  12.  #include <wx/stdpaths.h>
  13.  #include <wx/snglinst.h>
  14.  #include <wx/utils.h>
  15. diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
  16. index 78a20c5..e68b51a 100644
  17. --- a/src/qt/bitcoin.cpp
  18. +++ b/src/qt/bitcoin.cpp
  19. @@ -90,11 +90,11 @@ void MainFrameRepaint()
  20.  
  21.  /*
  22.     Translate string to current locale using Qt.
  23. - */
  24.  std::string _(const char* psz)
  25.  {
  26.      return QCoreApplication::translate("bitcoin-core", psz).toStdString();
  27.  }
  28. + */
  29.  
  30.  int main(int argc, char *argv[])
  31.  {
  32. diff --git a/src/qtui.h b/src/qtui.h
  33. index a3b9eb0..a3a6dc1 100644
  34. --- a/src/qtui.h
  35. +++ b/src/qtui.h
  36. @@ -8,7 +8,9 @@
  37.  #include <boost/function/function0.hpp>
  38.  #include "wallet.h"
  39.  
  40. +/* conflicts
  41.  typedef void wxWindow;
  42. +*/
  43.  #define wxYES                   0x00000002
  44.  #define wxOK                    0x00000004
  45.  #define wxNO                    0x00000008
  46. @@ -43,6 +45,8 @@ extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption,
  47.  extern void CalledSetStatusBar(const std::string& strText, int nField);
  48.  extern void UIThreadCall(boost::function0<void> fn);
  49.  extern void MainFrameRepaint();
  50. +/* conflicts
  51.  extern std::string _(const char* psz);
  52. +*/
  53.  
  54.  #endif
  55. diff --git a/src/rpc.cpp b/src/rpc.cpp
  56. index 4b7bb86..7d4188b 100644
  57. --- a/src/rpc.cpp
  58. +++ b/src/rpc.cpp
  59. @@ -1933,7 +1933,9 @@ void ThreadRPCServer2(void* parg)
  60.  
  61.      if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
  62.      {
  63. +  
  64.          string strWhatAmI = "To use bitcoind";
  65. +   /* Skip for now, restore that later
  66.          if (mapArgs.count("-server"))
  67.              strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
  68.          else if (mapArgs.count("-daemon"))
  69. @@ -1943,6 +1945,7 @@ void ThreadRPCServer2(void* parg)
  70.                "If the file does not exist, create it with owner-readable-only file permissions.\n"),
  71.                  strWhatAmI.c_str(),
  72.                  GetConfigFile().c_str());
  73. +   */
  74.          CreateThread(Shutdown, NULL);
  75.          return;
  76.      }
  77. @@ -2105,11 +2108,14 @@ void ThreadRPCServer2(void* parg)
  78.  
  79.  Object CallRPC(const string& strMethod, const Array& params)
  80.  {
  81. -    if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
  82. +    if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "") {
  83. +   /* Skip for now, restrore that later
  84.          throw runtime_error(strprintf(
  85.              _("You must set rpcpassword=<password> in the configuration file:\n%s\n"
  86.                "If the file does not exist, create it with owner-readable-only file permissions."),
  87.                  GetConfigFile().c_str()));
  88. +   */
  89. +    }
  90.  
  91.      // Connect to localhost
  92.      bool fUseSSL = GetBoolArg("-rpcssl");
  93.  
RAW Paste Data