diff options
| author | Matt Corallo <[email protected]> | 2012-06-10 02:04:15 +0200 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2012-06-15 17:19:13 +0200 |
| commit | ad5f29b7437fbdf6b25c4a5823b3dea0ac68b3ff (patch) | |
| tree | e8d4c45447a5e2f70488b907541c81e88108930c /src/qt/bitcoin.cpp | |
| parent | Fix #956 the Boost 1.49 way. (diff) | |
| download | discoin-ad5f29b7437fbdf6b25c4a5823b3dea0ac68b3ff.tar.xz discoin-ad5f29b7437fbdf6b25c4a5823b3dea0ac68b3ff.zip | |
Revert "Disable bitcoin: URI handling on Windows for the 0.6 release"
This reverts commit 7b90edb5a6cada7176012d09d748847b5f966585.
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 8c8c73f06..bac6dc4ce 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -116,9 +116,6 @@ static void handleRunawayException(std::exception *e) #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++) { @@ -137,7 +134,6 @@ int main(int argc, char *argv[]) } } } -#endif // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); @@ -262,8 +258,6 @@ int main(int argc, char *argv[]) { window.show(); } -#if !defined(MAC_OSX) && !defined(WIN32) -// TODO: implement qtipcserver.cpp for Mac and Windows // Place this here as guiref has to be defined if we dont want to lose URIs ipcInit(); @@ -282,7 +276,7 @@ int main(int argc, char *argv[]) } } } -#endif + app.exec(); window.hide(); |