From 98577bbcb89b7511bfaa2acf9caa030b9a4063d7 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Sun, 15 Feb 2015 21:40:27 +0100
Subject: [PATCH] Allow setting URLs in the widget (for config) and fix "salt"
 generation

---
 src/danbooruconnectwidget.cpp | 16 +++++++++++++---
 src/danbooruconnectwidget.h   |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/danbooruconnectwidget.cpp b/src/danbooruconnectwidget.cpp
index 7b6839d..780eefc 100644
--- a/src/danbooruconnectwidget.cpp
+++ b/src/danbooruconnectwidget.cpp
@@ -130,9 +130,9 @@ void DanbooruConnectWidget::getWalletData()
 
         QString hashedPassword;
 
-        hashedPassword = boardSalts.value(m_boardUrl);
+        hashedPassword = boardSalts.value(key);
 
-        hashedPassword = hashedPassword.arg(hashedPassword ,valueMap[QLatin1String("password")]);
+        hashedPassword = hashedPassword.arg(valueMap[QLatin1String("password")]);
         hashedPassword = QCryptographicHash::hash(hashedPassword.toUtf8(),
                          QCryptographicHash::Sha1).toHex();
 
@@ -154,6 +154,16 @@ void DanbooruConnectWidget::toggleLineEdits(int state)
     }
 }
 
+void DanbooruConnectWidget::setBoards(const QVector<QUrl> &urlList) {
+
+    danbooruUrlComboBox->clear();
+
+    for (auto item : urlList) {
+        danbooruUrlComboBox->insertUrl(urlList.indexOf(item), item);
+    }
+
+}
+
 void DanbooruConnectWidget::emitRejected()
 {
     Q_EMIT rejected();
@@ -192,7 +202,7 @@ void DanbooruConnectWidget::accept()
         if (m_password.isEmpty()) {
 
             hashedPassword = boardSalts.value(m_boardUrl);
-            hashedPassword = hashedPassword.arg(hashedPassword, passwdLineEdit->text());
+            hashedPassword = hashedPassword.arg(passwdLineEdit->text());
             hashedPassword = QCryptographicHash::hash(hashedPassword.toUtf8(),
                             QCryptographicHash::Sha1).toHex();
             m_password = hashedPassword;
diff --git a/src/danbooruconnectwidget.h b/src/danbooruconnectwidget.h
index 81eb401..98020db 100644
--- a/src/danbooruconnectwidget.h
+++ b/src/danbooruconnectwidget.h
@@ -53,6 +53,7 @@ public:
     QString password() const;
     QUrl boardUrl() const;
     bool isAnonymous() const;
+    void setBoards(const QVector<QUrl> &urlList);
 
 private:
     QUrl  m_boardUrl;