revert revision 56, going in different direction with boost::asio and JSON-RPC

1 files changed, 2 insertions, 27 deletions

diff --git a/ui.cpp b/ui.cpp
index 1f22170302..5d93ad227f 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -21,7 +21,6 @@ DEFINE_EVENT_TYPE(wxEVT_REPLY3)
 

 CMainFrame* pframeMain = NULL;

 CMyTaskBarIcon* ptaskbaricon = NULL;

-CServer* pserver = NULL;

 map<string, string> mapAddressBook;

 bool fRandSendTest = false;

 void RandSend();

@@ -385,8 +384,6 @@ CMainFrame::~CMainFrame()
     pframeMain = NULL;

     delete ptaskbaricon;

     ptaskbaricon = NULL;

-    delete pserver;

-    pserver = NULL;

 }

 

 void ExitTimeout(void* parg)

@@ -1690,8 +1687,8 @@ CAboutDialog::CAboutDialog(wxWindow* parent) : CAboutDialogBase(parent)
 #if !wxUSE_UNICODE

     // Workaround until upgrade to wxWidgets supporting UTF-8

     wxString str = m_staticTextMain->GetLabel();

-    if (str.Find('�') != wxNOT_FOUND)

-        str.Remove(str.Find('�'), 1);

+    if (str.Find('Â') != wxNOT_FOUND)

+        str.Remove(str.Find('Â'), 1);

     m_staticTextMain->SetLabel(str);

 #endif

 #ifndef __WXMSW__

@@ -3551,26 +3548,6 @@ bool CMyApp::OnInit2()
         return false;

     }

 

-    if (mapArgs.count("-blockamount")) {

-        CClient client;

-        wxString hostname = "localhost";

-        wxString server = GetDataDir() + "service";

-        CClientConnection * pconnection = (CClientConnection *)client.MakeConnection(hostname, server, "ipc test");

-        string output = "";

-        if (pconnection) {

-            char * pbuffer = (char *)pconnection->Request("blockamount");

-            while (*pbuffer != '\n') {

-                output += *pbuffer;

-                pbuffer++;

-            }

-        }

-        else {

-            output = "Cannot access Bitcoin. Are you sure the program is running?\n";

-        }

-        fprintf(stderr, "%s", output.c_str());

-        return false;

-    }

-

     if (mapArgs.count("-datadir"))

         strlcpy(pszSetDataDir, mapArgs["-datadir"].c_str(), sizeof(pszSetDataDir));

 

@@ -3778,8 +3755,6 @@ bool CMyApp::OnInit2()
     if (fFirstRun)

         SetStartOnSystemStartup(true);

 

-    pserver = new CServer;

-    pserver->Create(GetDataDir() + "service");

 

     //

     // Tests