Mercurial > hg > bitcoin
changeset 2781:f3c54041a8c6 draft
Revert "Disable bitcoin: URI handling on Windows for the 0.6 release"
This reverts commit 7b90edb5a6cada7176012d09d748847b5f966585.
| author | Matt Corallo <matt@bluematt.me> |
|---|---|
| date | Sun, 10 Jun 2012 02:04:15 +0200 |
| parents | 0ee29e5cab0e |
| children | 9ca8fbb3c36d |
| files | share/setup.nsi src/qt/bitcoin.cpp src/qt/qtipcserver.cpp |
| diffstat | 3 files changed, 5 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/share/setup.nsi +++ b/share/setup.nsi @@ -98,12 +98,10 @@ WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1 WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 - - # bitcoin: URI handling disabled for 0.6.0 - # WriteRegStr HKCR "bitcoin" "URL Protocol" "" - # WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin" - # WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe - # WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "$$1"' + WriteRegStr HKCR "bitcoin" "URL Protocol" "" + WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin" + WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe + WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "$$1"' SectionEnd # Macro for selecting uninstaller sections
--- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -116,9 +116,6 @@ #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 @@ } } } -#endif // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); @@ -262,8 +258,6 @@ { 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 @@ } } } -#endif + app.exec(); window.hide();
--- a/src/qt/qtipcserver.cpp +++ b/src/qt/qtipcserver.cpp @@ -54,12 +54,6 @@ // 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];