diff options
| author | Wojciech GomoĊa <szogun1987@gmail.com> | 2018-01-28 14:52:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-28 14:52:53 +0100 |
| commit | 1ad20a1fb3705fcc57569ef71e0145a8d2277f8f (patch) | |
| tree | 1547832f1258303ee7b51bf98f6d054c9c6a5921 /src/libwalletqt/WalletManager.cpp | |
| parent | 9d22b6ab4da8f310b629f989233c517eb51d301d (diff) | |
| parent | bed05a484cd54cf7269c75df2b1446638df26f7f (diff) | |
| download | monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.tar.gz monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.tar.xz monzero-gui-1ad20a1fb3705fcc57569ef71e0145a8d2277f8f.zip | |
Merge pull request #1 from monero-project/master
Refresh with source fork
Diffstat (limited to 'src/libwalletqt/WalletManager.cpp')
| -rw-r--r-- | src/libwalletqt/WalletManager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index 875e4cca..73b0a006 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -49,7 +49,7 @@ Wallet *WalletManager::openWallet(const QString &path, const QString &password, __PRETTY_FUNCTION__, qPrintable(path), testnet); Monero::Wallet * w = m_pimpl->openWallet(path.toStdString(), password.toStdString(), testnet); - qDebug("%s: opened wallet: %s, status: %d", __PRETTY_FUNCTION__, w->address().c_str(), w->status()); + qDebug("%s: opened wallet: %s, status: %d", __PRETTY_FUNCTION__, w->address(0, 0).c_str(), w->status()); m_currentWallet = new Wallet(w); // move wallet to the GUI thread. Otherwise it wont be emitting signals @@ -110,7 +110,7 @@ QString WalletManager::closeWallet() QMutexLocker locker(&m_mutex); QString result; if (m_currentWallet) { - result = m_currentWallet->address(); + result = m_currentWallet->address(0, 0); delete m_currentWallet; } else { qCritical() << "Trying to close non existing wallet " << m_currentWallet; @@ -304,6 +304,7 @@ QUrl WalletManager::localPathToUrl(const QString &path) const return QUrl::fromLocalFile(path); } +#ifndef DISABLE_PASS_STRENGTH_METER double WalletManager::getPasswordStrength(const QString &password) const { static const char *local_dict[] = { @@ -318,6 +319,7 @@ double WalletManager::getPasswordStrength(const QString &password) const ZxcvbnUnInit(); return e; } +#endif bool WalletManager::saveQrCode(const QString &code, const QString &path) const { |