Disable bitcoin: URI handling on Windows for the 0.6 release
This commit is contained in:
parent
01a196e08d
commit
7b90edb5a6
3 changed files with 21 additions and 5 deletions
|
@ -94,10 +94,12 @@ Section -post SEC0001
|
|||
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
|
||||
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"'
|
||||
|
||||
# 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"'
|
||||
SectionEnd
|
||||
|
||||
# Macro for selecting uninstaller sections
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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];
|
||||
|
|
Loading…
Reference in a new issue