diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/headers.h | 8 | ||||
| -rw-r--r-- | src/init.cpp | 10 | ||||
| -rw-r--r-- | src/keystore.h | 1 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 4 | ||||
| -rw-r--r-- | src/net.cpp | 1 | ||||
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 149 | ||||
| -rw-r--r-- | src/wallet.cpp | 1 |
8 files changed, 25 insertions, 151 deletions
diff --git a/src/headers.h b/src/headers.h index 1e174da0de..fd086faee8 100644 --- a/src/headers.h +++ b/src/headers.h @@ -18,7 +18,13 @@ #endif #define _WIN32_IE 0x0400 #define WIN32_LEAN_AND_MEAN 1 + +// Include boost/foreach here as it defines __STDC_LIMIT_MACROS on some systems. +#include <boost/foreach.hpp> +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h +#endif + #if (defined(__unix__) || defined(unix)) && !defined(USG) #include <sys/param.h> // to get BSD define #endif @@ -49,8 +55,6 @@ #include <deque> #include <map> -#include <boost/foreach.hpp> - #ifdef WIN32 #include <windows.h> #include <winsock2.h> diff --git a/src/init.cpp b/src/init.cpp index 28be7ef7c0..d6e153285e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -12,6 +12,16 @@ #include <boost/filesystem/fstream.hpp> #include <boost/interprocess/sync/file_lock.hpp> +#if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) +#define _BITCOIN_QT_PLUGINS_INCLUDED +#define __INSURE__ +#include <QtPlugin> +Q_IMPORT_PLUGIN(qcncodecs) +Q_IMPORT_PLUGIN(qjpcodecs) +Q_IMPORT_PLUGIN(qtwcodecs) +Q_IMPORT_PLUGIN(qkrcodecs) +#endif + using namespace std; using namespace boost; diff --git a/src/keystore.h b/src/keystore.h index bbfac83d1f..1f2c6aea3e 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -114,6 +114,7 @@ public: return CBasicKeyStore::HaveKey(address); return mapCryptedKeys.count(address) > 0; } + return false; } bool GetKey(const CBitcoinAddress &address, CKey& keyOut) const; bool GetPubKey(const CBitcoinAddress &address, std::vector<unsigned char>& vchPubKeyOut) const; diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index eb22190e57..29b433f851 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -9,13 +9,13 @@ USE_UPNP:=0 INCLUDEPATHS= \ -I"$(DEPSDIR)/boost_1_47_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ - -I"$(DEPSDIR)/openssl-1.0.0d/include" \ + -I"$(DEPSDIR)/openssl-1.0.0e/include" \ -I"$(DEPSDIR)" LIBPATHS= \ -L"$(DEPSDIR)/boost_1_47_0/stage/lib" \ -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ - -L"$(DEPSDIR)/openssl-1.0.0d" + -L"$(DEPSDIR)/openssl-1.0.0e" LIBS= \ -l boost_system-mt-s \ diff --git a/src/net.cpp b/src/net.cpp index ead7362616..0c28eaa379 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1210,7 +1210,6 @@ void MapPort(bool /* unused fMapPort */) static const char *strDNSSeed[] = { "bitseed.xf2.org", - "bitseed.bitcoin.org.uk", "dnsseed.bluematt.me", }; diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 86ac8a0271..6afa9671d0 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) if (!translator.isEmpty()) app.installTranslator(&translator); - app.setApplicationName(QApplication::translate("main", "Bitcoin Qt")); + app.setApplicationName(QApplication::translate("main", "Bitcoin-Qt")); QSplashScreen splash(QPixmap(":/images/splash"), 0); splash.show(); diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 45aadd49a5..647adb9c53 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -18,6 +18,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for addnode and connect\n") QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to\n"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node\n"), QT_TRANSLATE_NOOP("bitcoin-core", "Don't accept connections from outside\n"), +QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: 100)\n"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Number of seconds to keep misbehaving peers from reconnecting (default: " +"86400)\n"), QT_TRANSLATE_NOOP("bitcoin-core", "Don't attempt to use UPnP to map the listening port\n"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to use UPnP to map the listening port\n"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee per KB to add to transactions you send\n"), @@ -66,151 +70,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Unable to bind to port %d on this computer. Bitcoin is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"This transaction is over the size limit. You can still send it for a fee of " -"%s, which goes to the nodes that process your transaction and helps to " -"support the network. Do you want to pay the fee?"), -QT_TRANSLATE_NOOP("bitcoin-core", "Enter the current passphrase to the wallet."), -QT_TRANSLATE_NOOP("bitcoin-core", "Passphrase"), -QT_TRANSLATE_NOOP("bitcoin-core", "Please supply the current wallet decryption passphrase."), -QT_TRANSLATE_NOOP("bitcoin-core", "The passphrase entered for the wallet decryption was incorrect."), -QT_TRANSLATE_NOOP("bitcoin-core", "Status"), -QT_TRANSLATE_NOOP("bitcoin-core", "Date"), -QT_TRANSLATE_NOOP("bitcoin-core", "Description"), -QT_TRANSLATE_NOOP("bitcoin-core", "Debit"), -QT_TRANSLATE_NOOP("bitcoin-core", "Credit"), -QT_TRANSLATE_NOOP("bitcoin-core", "Open for %d blocks"), -QT_TRANSLATE_NOOP("bitcoin-core", "Open until %s"), -QT_TRANSLATE_NOOP("bitcoin-core", "%d/offline?"), -QT_TRANSLATE_NOOP("bitcoin-core", "%d/unconfirmed"), -QT_TRANSLATE_NOOP("bitcoin-core", "%d confirmations"), -QT_TRANSLATE_NOOP("bitcoin-core", "Generated"), -QT_TRANSLATE_NOOP("bitcoin-core", "Generated (%s matures in %d more blocks)"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Generated - Warning: This block was not received by any other nodes and will " -"probably not be accepted!"), -QT_TRANSLATE_NOOP("bitcoin-core", "Generated (not accepted)"), -QT_TRANSLATE_NOOP("bitcoin-core", "From: "), -QT_TRANSLATE_NOOP("bitcoin-core", "Received with: "), -QT_TRANSLATE_NOOP("bitcoin-core", "Payment to yourself"), -QT_TRANSLATE_NOOP("bitcoin-core", "To: "), -QT_TRANSLATE_NOOP("bitcoin-core", " Generating"), -QT_TRANSLATE_NOOP("bitcoin-core", "(not connected)"), -QT_TRANSLATE_NOOP("bitcoin-core", " %d connections %d blocks %d transactions"), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet already encrypted."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Enter the new passphrase to the wallet.\n" -"Please use a passphrase of 10 or more random characters, or eight or more " -"words."), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: The supplied passphrase was too short."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"WARNING: If you encrypt your wallet and lose your passphrase, you will LOSE " -"ALL OF YOUR BITCOINS!\n" -"Are you sure you wish to encrypt your wallet?"), -QT_TRANSLATE_NOOP("bitcoin-core", "Please re-enter your new wallet passphrase."), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: the supplied passphrases didn't match."), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet encryption failed."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Wallet Encrypted.\n" -"Remember that encrypting your wallet cannot fully protect your bitcoins from " -"being stolen by malware infecting your computer."), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet is unencrypted, please encrypt it first."), -QT_TRANSLATE_NOOP("bitcoin-core", "Enter the new passphrase for the wallet."), -QT_TRANSLATE_NOOP("bitcoin-core", "Re-enter the new passphrase for the wallet."), -QT_TRANSLATE_NOOP("bitcoin-core", "Wallet Passphrase Changed."), -QT_TRANSLATE_NOOP("bitcoin-core", "New Receiving Address"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"You should use a new address for each payment you receive.\n" -"\n" -"Label"), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>Status:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", ", has not been successfully broadcast yet"), -QT_TRANSLATE_NOOP("bitcoin-core", ", broadcast through %d node"), -QT_TRANSLATE_NOOP("bitcoin-core", ", broadcast through %d nodes"), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>Date:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>Source:</b> Generated<br>"), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>From:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", "unknown"), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>To:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", " (yours, label: "), -QT_TRANSLATE_NOOP("bitcoin-core", " (yours)"), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>Credit:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", "(%s matures in %d more blocks)"), -QT_TRANSLATE_NOOP("bitcoin-core", "(not accepted)"), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>Debit:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>Transaction fee:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", "<b>Net amount:</b> "), -QT_TRANSLATE_NOOP("bitcoin-core", "Message:"), -QT_TRANSLATE_NOOP("bitcoin-core", "Comment:"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Generated coins must wait 120 blocks before they can be spent. When you " -"generated this block, it was broadcast to the network to be added to the " -"block chain. If it fails to get into the chain, it will change to \"not " -"accepted\" and not be spendable. This may occasionally happen if another " -"node generates a block within a few seconds of yours."), -QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write autostart/bitcoin.desktop file"), -QT_TRANSLATE_NOOP("bitcoin-core", "Main"), -QT_TRANSLATE_NOOP("bitcoin-core", "&Start Bitcoin on window system startup"), -QT_TRANSLATE_NOOP("bitcoin-core", "&Minimize on close"), -QT_TRANSLATE_NOOP("bitcoin-core", "version %s"), -QT_TRANSLATE_NOOP("bitcoin-core", "Error in amount "), -QT_TRANSLATE_NOOP("bitcoin-core", "Send Coins"), -QT_TRANSLATE_NOOP("bitcoin-core", "Amount exceeds your balance "), -QT_TRANSLATE_NOOP("bitcoin-core", "Total exceeds your balance when the "), -QT_TRANSLATE_NOOP("bitcoin-core", " transaction fee is included "), -QT_TRANSLATE_NOOP("bitcoin-core", "Payment sent "), -QT_TRANSLATE_NOOP("bitcoin-core", "Sending..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid address "), -QT_TRANSLATE_NOOP("bitcoin-core", "Sending %s to %s"), -QT_TRANSLATE_NOOP("bitcoin-core", "CANCELLED"), -QT_TRANSLATE_NOOP("bitcoin-core", "Cancelled"), -QT_TRANSLATE_NOOP("bitcoin-core", "Transfer cancelled "), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: "), -QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), -QT_TRANSLATE_NOOP("bitcoin-core", "Connecting..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Unable to connect"), -QT_TRANSLATE_NOOP("bitcoin-core", "Requesting public key..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Received public key..."), -QT_TRANSLATE_NOOP("bitcoin-core", "Recipient is not accepting transactions sent by IP address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Transfer was not accepted"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid response received"), -QT_TRANSLATE_NOOP("bitcoin-core", "Creating transaction..."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"This transaction requires a transaction fee of at least %s because of its " -"amount, complexity, or use of recently received funds"), -QT_TRANSLATE_NOOP("bitcoin-core", "Transaction creation failed"), -QT_TRANSLATE_NOOP("bitcoin-core", "Transaction aborted"), -QT_TRANSLATE_NOOP("bitcoin-core", "Lost connection, transaction cancelled"), -QT_TRANSLATE_NOOP("bitcoin-core", "Sending payment..."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"The transaction was rejected. This might happen if some of the coins in " -"your wallet were already spent, such as if you used a copy of wallet.dat and " -"coins were spent in the copy but not marked as spent here."), -QT_TRANSLATE_NOOP("bitcoin-core", "Waiting for confirmation..."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"The payment was sent, but the recipient was unable to verify it.\n" -"The transaction is recorded and will credit to the recipient,\n" -"but the comment information will be blank."), -QT_TRANSLATE_NOOP("bitcoin-core", "Payment was sent, but an invalid response was received"), -QT_TRANSLATE_NOOP("bitcoin-core", "Payment completed"), -QT_TRANSLATE_NOOP("bitcoin-core", "Name"), -QT_TRANSLATE_NOOP("bitcoin-core", "Address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Label"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Address"), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"This is one of your own addresses for receiving payments and cannot be " -"entered in the address book. "), -QT_TRANSLATE_NOOP("bitcoin-core", "Edit Address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Edit Address Label"), -QT_TRANSLATE_NOOP("bitcoin-core", "Add Address"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin - Generating"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin - (not connected)"), -QT_TRANSLATE_NOOP("bitcoin-core", "&Open Bitcoin"), -QT_TRANSLATE_NOOP("bitcoin-core", "&Send Bitcoins"), -QT_TRANSLATE_NOOP("bitcoin-core", "O&ptions..."), -QT_TRANSLATE_NOOP("bitcoin-core", "E&xit"), -QT_TRANSLATE_NOOP("bitcoin-core", "Program has crashed and will terminate. "), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: Please check that your computer's date and time are correct. If " "your clock is wrong Bitcoin will not work properly."), QT_TRANSLATE_NOOP("bitcoin-core", "beta"), diff --git a/src/wallet.cpp b/src/wallet.cpp index 30a561dcb4..46c57e2fc6 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -39,6 +39,7 @@ bool CWallet::AddCryptedKey(const vector<unsigned char> &vchPubKey, const vector else return CWalletDB(strWalletFile).WriteCryptedKey(vchPubKey, vchCryptedSecret); } + return false; } bool CWallet::Unlock(const string& strWalletPassphrase) |