diff options
-rw-r--r-- | headers.h | 3 | ||||
-rw-r--r-- | ipc.cpp | 33 | ||||
-rw-r--r-- | ipc.h | 28 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | makefile.unix.wx2.8 | 5 | ||||
-rw-r--r-- | makefile.unix.wx2.9 | 7 | ||||
-rw-r--r-- | ui.cpp | 29 |
7 files changed, 8 insertions, 101 deletions
@@ -24,8 +24,6 @@ #include <wx/taskbar.h>
#include <wx/stdpaths.h>
#include <wx/utils.h>
-#include <wx/ipc.h>
-#include <wx/ipcbase.h>
#include <openssl/ecdsa.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
@@ -104,7 +102,6 @@ using namespace boost; #include "market.h"
#include "uibase.h"
#include "ui.h"
-#include "ipc.h"
#include "xpm/addressbook16.xpm"
#include "xpm/addressbook20.xpm"
diff --git a/ipc.cpp b/ipc.cpp deleted file mode 100644 index 86e57674e2..0000000000 --- a/ipc.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Inter-process calling functionality - */ - -#include "headers.h" - -wxConnectionBase * CServer::OnAcceptConnection (const wxString &topic) { - return new CServerConnection; -} - -wxConnectionBase * CClient::OnMakeConnection () { - return new CClientConnection; -} - -// For request based handling -const void * CServerConnection::OnRequest (const wxString &topic, const wxString &item, size_t *size, wxIPCFormat format) { - const char * output; - - if (item == "blockamount") { - stringstream stream; - stream << nBestHeight + 1; - output = stream.str().c_str(); - } - else - output = "Unknown identifier"; - - return output; -} - -// For event based handling -bool CClientConnection::OnAdvise (const wxString &topic, const wxString &item, const void *data, size_t size, wxIPCFormat format) { - return false; -}
\ No newline at end of file diff --git a/ipc.h b/ipc.h deleted file mode 100644 index 777d31b2b7..0000000000 --- a/ipc.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _IPC_H -#define _IPC_H - -class CServer : public wxServer { -public: - wxConnectionBase * OnAcceptConnection (const wxString &topic); -}; - -class CClient : public wxClient { -public: - wxConnectionBase * OnMakeConnection (); -}; - -class CServerConnection : public wxConnection { -public: - const void * OnRequest (const wxString &topic, const wxString &item, size_t *size, wxIPCFormat format); -}; - -class CClientConnection : public wxConnection { -public: - CClientConnection() : wxConnection() {} - ~CClientConnection() {} - - bool OnAdvise (const wxString &topic, const wxString &item, const void *data, size_t size, wxIPCFormat format); -}; - -#endif /* _IPC_H */ - @@ -67,12 +67,10 @@ obj/irc.o: irc.cpp $(HEADERS) obj/ui_res.o: ui.rc rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp
windres $(WXDEFS) $(INCLUDEPATHS) -o $@ -i $<
-obj/ipc.o: ipc.cpp $(HEADERS)
- g++ -c $(CFLAGS) -o $@ $<
OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
- obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/ui_res.o obj/ipc.o
+ obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/ui_res.o
bitcoin.exe: headers.h.gch $(OBJS)
-kill /f bitcoin.exe
diff --git a/makefile.unix.wx2.8 b/makefile.unix.wx2.8 index 899ce29543..b9826d6ccb 100644 --- a/makefile.unix.wx2.8 +++ b/makefile.unix.wx2.8 @@ -75,12 +75,11 @@ obj/sha.o: sha.cpp sha.h obj/irc.o: irc.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<
-obj/ipc.o: ipc.cpp $(HEADERS)
- g++ -c $(CFLAGS) -o $@ $<
+
OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
- obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/ipc.o
+ obj/ui.o obj/uibase.o obj/sha.o obj/irc.o
bitcoin: headers.h.gch $(OBJS)
g++ $(CFLAGS) -o $@ $(LIBPATHS) $(OBJS) $(LIBS)
diff --git a/makefile.unix.wx2.9 b/makefile.unix.wx2.9 index d2c4eb5ea1..81dcbd70e9 100644 --- a/makefile.unix.wx2.9 +++ b/makefile.unix.wx2.9 @@ -31,7 +31,7 @@ LIBS= \ -l wx_gtk2u$(D)-2.9 \
-Wl,-Bdynamic \
-l crypto \
- -l gtk-x11-2.0 -l gthread-2.0 -l SM \
+ -l gtk-x11-2.0 -l gthread-2.0 -l SM
WXDEFS=-D__WXGTK__ -DNOPCH
CFLAGS=-O0 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
@@ -75,12 +75,11 @@ obj/sha.o: sha.cpp sha.h obj/irc.o: irc.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<
-obj/ipc.o: ipc.cpp $(HEADERS)
- g++ -c $(CFLAGS) -o $@ $<
+
OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
- obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/ipc.o
+ obj/ui.o obj/uibase.o obj/sha.o obj/irc.o
bitcoin: headers.h.gch $(OBJS)
g++ $(CFLAGS) -o $@ $(LIBPATHS) $(OBJS) $(LIBS)
@@ -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
|