Procházet zdrojové kódy

Revert "Disable bitcoin: URI handling on Windows for the 0.6 release"

This reverts commit 7b90edb5a6.
tags/v0.15.1
Matt Corallo před 9 roky
rodič
revize
ad5f29b743
3 změnil soubory, kde provedl 5 přidání a 19 odebrání
  1. 4
    6
      share/setup.nsi
  2. 1
    7
      src/qt/bitcoin.cpp
  3. 0
    6
      src/qt/qtipcserver.cpp

+ 4
- 6
share/setup.nsi Zobrazit soubor

@@ -98,12 +98,10 @@ 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
# 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

+ 1
- 7
src/qt/bitcoin.cpp Zobrazit soubor

@@ -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();

+ 0
- 6
src/qt/qtipcserver.cpp Zobrazit soubor

@@ -54,12 +54,6 @@ 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];

Načítá se…
Zrušit
Uložit