diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-26 12:18:24 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-26 12:18:24 -0400 |
commit | 7b90edb5a6cada7176012d09d748847b5f966585 (patch) | |
tree | dd5d732cd00d91ed0797731f368249e3b64c204b /src | |
parent | 01a196e08db49d83cf6c5abd8a799c56dcfef503 (diff) |
Disable bitcoin: URI handling on Windows for the 0.6 release
Diffstat (limited to 'src')
-rw-r--r-- | src/qt/bitcoin.cpp | 10 | ||||
-rw-r--r-- | src/qt/qtipcserver.cpp | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 27d57b35e1..68f750ddaf 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -126,6 +126,9 @@ std::string _(const char* psz) #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { +#if !defined(MAC_OSX) && !defined(WIN32) +// TODO: implement qtipcserver.cpp for Mac and Windows + // Do this early as we don't want to bother initializing if we are just calling IPC for (int i = 1; i < argc; i++) { @@ -144,6 +147,7 @@ int main(int argc, char *argv[]) } } } +#endif // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); @@ -245,6 +249,10 @@ int main(int argc, char *argv[]) // Place this here as guiref has to be defined if we dont want to lose URLs ipcInit(); + +#if !defined(MAC_OSX) && !defined(WIN32) +// TODO: implement qtipcserver.cpp for Mac and Windows + // Check for URL in argv for (int i = 1; i < argc; i++) { @@ -259,7 +267,7 @@ int main(int argc, char *argv[]) } } } - +#endif app.exec(); guiref = 0; diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp index 7f5d040338..8b9270e178 100644 --- a/src/qt/qtipcserver.cpp +++ b/src/qt/qtipcserver.cpp @@ -48,6 +48,12 @@ void ipcInit() // TODO: implement bitcoin: URI handling the Mac Way return; #endif +#ifdef WIN32 + // TODO: THOROUGHLY test boost::interprocess fix, + // and make sure there are no Windows argument-handling exploitable + // problems. + return; +#endif message_queue* mq; char strBuf[257]; |