mirror of
https://github.com/dashpay/dash.git
synced 2024-12-28 13:32:47 +01:00
13188e1d92
faca73000fa8975c28f6be8be01957c1ae94ea62 ci: Install fixed version of clang-format for linters (MarcoFalke)
fa4695da4c69646b58a8fa0b6b30146bb234deb8 build: Sort Makefile.am after renaming file (MarcoFalke)
cccc2784a3bb10fa8e43be7e68207cafb12bd915 scripted-diff: Move ui_interface to the node lib (MarcoFalke)
fa72ca6a9d90d66012765b0043fd819698b94ba8 qt: Remove unused includes (MarcoFalke)
fac96e6450d595fe67168cb7afa7692da6cc9973 wallet: Do not include server symbols (MarcoFalke)
fa0f6c58c1c6d10f04c4e65a424cc51ebca50a8c Revert "Fix link error with --enable-debug" (MarcoFalke)
Pull request description:
This reverts a hacky workaround from commit b83cc0f, which only happens to work due to compiler optimizations. Then, it actually fixes the linker error.
The underlying problem is that the wallet includes symbols from the server (ui_interface), which usually results in linker failures. Though, in this specific case the linker failures have not been observed (unless `-O0`) because our compilers were smart enough to strip unused symbols.
Fix the underlying problem by creating a new header-only with the needed symbol and move ui_interface to node to clarify that this is part of libbitcoin_server.
ACKs for top commit:
Sjors:
ACK faca730
laanwj:
ACK faca73000fa8975c28f6be8be01957c1ae94ea62
hebasto:
re-ACK faca73000fa8975c28f6be8be01957c1ae94ea62, since the [previous](https://github.com/bitcoin/bitcoin/pull/19331#pullrequestreview-434420539) review:
Tree-SHA512: e9731f249425aaea50b6db5fc7622e10078cf006721bb87989cac190a2ff224412f6f8a7dd83efd018835302337611f5839e29e15bef366047ed591cef58dfb4
100 lines
3.3 KiB
C++
100 lines
3.3 KiB
C++
// Copyright (c) 2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2019 The Bitcoin Core developers
|
|
// Copyright (c) 2014-2022 The Dash Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <noui.h>
|
|
|
|
#include <logging.h>
|
|
#include <node/ui_interface.h>
|
|
#include <util/translation.h>
|
|
|
|
#include <string>
|
|
|
|
#include <boost/signals2/connection.hpp>
|
|
|
|
/** Store connections so we can disconnect them when suppressing output */
|
|
boost::signals2::connection noui_ThreadSafeMessageBoxConn;
|
|
boost::signals2::connection noui_ThreadSafeQuestionConn;
|
|
boost::signals2::connection noui_InitMessageConn;
|
|
|
|
bool noui_ThreadSafeMessageBox(const bilingual_str& message, const std::string& caption, unsigned int style)
|
|
{
|
|
bool fSecure = style & CClientUIInterface::SECURE;
|
|
style &= ~CClientUIInterface::SECURE;
|
|
|
|
std::string strCaption;
|
|
switch (style) {
|
|
case CClientUIInterface::MSG_ERROR:
|
|
strCaption = "Error: ";
|
|
break;
|
|
case CClientUIInterface::MSG_WARNING:
|
|
strCaption = "Warning: ";
|
|
break;
|
|
case CClientUIInterface::MSG_INFORMATION:
|
|
strCaption = "Information: ";
|
|
break;
|
|
default:
|
|
strCaption = caption + ": "; // Use supplied caption (can be empty)
|
|
}
|
|
|
|
if (!fSecure) {
|
|
LogPrintf("%s%s\n", strCaption, message.original);
|
|
}
|
|
tfm::format(std::cerr, "%s%s\n", strCaption, message.original);
|
|
return false;
|
|
}
|
|
|
|
bool noui_ThreadSafeQuestion(const bilingual_str& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
return noui_ThreadSafeMessageBox(Untranslated(message), caption, style);
|
|
}
|
|
|
|
void noui_InitMessage(const std::string& message)
|
|
{
|
|
LogPrintf("init message: %s\n", message);
|
|
}
|
|
|
|
void noui_connect()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
|
|
noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
|
|
noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessage);
|
|
}
|
|
|
|
bool noui_ThreadSafeMessageBoxRedirect(const bilingual_str& message, const std::string& caption, unsigned int style)
|
|
{
|
|
LogPrintf("%s: %s\n", caption, message.original);
|
|
return false;
|
|
}
|
|
|
|
bool noui_ThreadSafeQuestionRedirect(const bilingual_str& /* ignored interactive message */, const std::string& message, const std::string& caption, unsigned int style)
|
|
{
|
|
LogPrintf("%s: %s\n", caption, message);
|
|
return false;
|
|
}
|
|
|
|
void noui_InitMessageRedirect(const std::string& message)
|
|
{
|
|
LogPrintf("init message: %s\n", message);
|
|
}
|
|
|
|
void noui_test_redirect()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn.disconnect();
|
|
noui_ThreadSafeQuestionConn.disconnect();
|
|
noui_InitMessageConn.disconnect();
|
|
noui_ThreadSafeMessageBoxConn = uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBoxRedirect);
|
|
noui_ThreadSafeQuestionConn = uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestionRedirect);
|
|
noui_InitMessageConn = uiInterface.InitMessage_connect(noui_InitMessageRedirect);
|
|
}
|
|
|
|
void noui_reconnect()
|
|
{
|
|
noui_ThreadSafeMessageBoxConn.disconnect();
|
|
noui_ThreadSafeQuestionConn.disconnect();
|
|
noui_InitMessageConn.disconnect();
|
|
noui_connect();
|
|
}
|