1 files changed, 1 insertions, 37 deletions

diff --git a/src/plugins/General/scrobbler/settingsdialog.cpp b/src/plugins/General/scrobbler/settingsdialog.cpp
index 060b7099d..8896c8f8c 100644
--- a/src/plugins/General/scrobbler/settingsdialog.cpp
+++ b/src/plugins/General/scrobbler/settingsdialog.cpp
@@ -30,25 +30,19 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
     m_ui.setupUi(this);
     m_lastfmAuth = new ScrobblerAuth(SCROBBLER_LASTFM_URL, LASTFM_AUTH_URL, "lastfm", this);
     m_librefmAuth = new ScrobblerAuth(SCROBBLER_LIBREFM_URL, LIBREFM_AUTH_URL, "librefm", this);
-    m_listenbrainzAuth = new ScrobblerAuth(SCROBBLER_LISTENBRAINZ_URL, LISTENBRAINZ_AUTH_URL, "listenbrainz", this);
     connect(m_lastfmAuth, SIGNAL(tokenRequestFinished(int)), SLOT(processTokenResponse(int)));
     connect(m_lastfmAuth, SIGNAL(sessionRequestFinished(int)), SLOT(processSessionResponse(int)));
     connect(m_lastfmAuth, SIGNAL(checkSessionFinished(int)), SLOT(processCheckResponse(int)));
     connect(m_librefmAuth, SIGNAL(tokenRequestFinished(int)), SLOT(processTokenResponse(int)));
     connect(m_librefmAuth, SIGNAL(sessionRequestFinished(int)), SLOT(processSessionResponse(int)));
     connect(m_librefmAuth, SIGNAL(checkSessionFinished(int)), SLOT(processCheckResponse(int)));
-    connect(m_listenbrainzAuth, SIGNAL(tokenRequestFinished(int)), SLOT(processTokenResponse(int)));
-    connect(m_listenbrainzAuth, SIGNAL(sessionRequestFinished(int)), SLOT(processSessionResponse(int)));
-    connect(m_listenbrainzAuth, SIGNAL(checkSessionFinished(int)), SLOT(processCheckResponse(int)));
 
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Scrobbler");
     m_ui.lastfmGroupBox->setChecked(settings.value("use_lastfm", false).toBool());
     m_ui.librefmGroupBox->setChecked(settings.value("use_librefm", false).toBool());
-    m_ui.listenbrainzGroupBox->setChecked(settings.value("use_listenbrainz", false).toBool());
     m_ui.sessionLineEdit_lastfm->setText(settings.value("lastfm_session").toString());
     m_ui.sessionLineEdit_librefm->setText(settings.value("librefm_session").toString());
-    m_ui.sessionLineEdit_listenbrainz->setText(settings.value("listenbrainz_session").toString());
     settings.endGroup();
 }
 
@@ -61,10 +55,8 @@ void SettingsDialog::accept()
     settings.beginGroup("Scrobbler");
     settings.setValue("use_lastfm", m_ui.lastfmGroupBox->isChecked());
     settings.setValue("use_librefm", m_ui.librefmGroupBox->isChecked());
-    settings.setValue("use_listenbrainz", m_ui.listenbrainzGroupBox->isChecked());
     settings.setValue("lastfm_session",m_ui.sessionLineEdit_lastfm->text());
     settings.setValue("librefm_session",m_ui.sessionLineEdit_librefm->text());
-    settings.setValue("listenbrainz_session",m_ui.sessionLineEdit_listenbrainz->text());
     settings.endGroup();
     QDialog::accept();
 }
@@ -81,20 +73,13 @@ void SettingsDialog::on_newSessionButton_librefm_clicked()
     m_librefmAuth->getToken();
 }
 
-void SettingsDialog::on_newSessionButton_listenbrainz_clicked()
-{
-    m_ui.newSessionButton_listenbrainz->setEnabled(false);
-    m_listenbrainzAuth->getToken();
-}
-
 void SettingsDialog::processTokenResponse(int error)
 {
     if(sender() == m_lastfmAuth)
         m_ui.newSessionButton_lastfm->setEnabled(true);
     else if(sender() == m_librefmAuth)
         m_ui.newSessionButton_librefm->setEnabled(true);
-    else if(sender() == m_listenbrainzAuth)
-        m_ui.newSessionButton_listenbrainz->setEnabled(true);
+
     switch(error)
     {
     case ScrobblerAuth::NO_ERROR:
@@ -112,11 +97,6 @@ void SettingsDialog::processTokenResponse(int error)
             m_ui.newSessionButton_librefm->setEnabled(false);
             name = QLatin1String("Libre.fm");
         }
-        else if(auth == m_listenbrainzAuth)
-        {
-            m_ui.newSessionButton_listenbrainz->setEnabled(false);
-            name = QLatin1String("ListenBrainz");
-        }
         else
         {
             qWarning("SettingsDialog: invalid sender");
@@ -161,11 +141,6 @@ void SettingsDialog::processSessionResponse(int error)
             m_ui.sessionLineEdit_librefm->setText(m_librefmAuth->session());
             settings.setValue("Scrobbler/librefm_session",m_ui.sessionLineEdit_librefm->text());
         }
-        else if(sender() == m_listenbrainzAuth)
-        {
-            m_ui.sessionLineEdit_listenbrainz->setText(m_listenbrainzAuth->session());
-            settings.setValue("Scrobbler/listenbrainz_session",m_ui.sessionLineEdit_listenbrainz->text());
-        }
         break;
     }
     case ScrobblerAuth::NETWORK_ERROR:
@@ -195,15 +170,6 @@ void SettingsDialog::on_checkButton_librefm_clicked()
     }
 }
 
-void SettingsDialog::on_checkButton_listenbrainz_clicked()
-{
-    if(!m_ui.sessionLineEdit_listenbrainz->text().isEmpty())
-    {
-        m_ui.checkButton_listenbrainz->setEnabled(false);
-        m_listenbrainzAuth->checkSession(m_ui.sessionLineEdit_listenbrainz->text());
-    }
-}
-
 void SettingsDialog::processCheckResponse(int error)
 {
     if(sender() == m_lastfmAuth)
@@ -219,8 +185,6 @@ void SettingsDialog::processCheckResponse(int error)
             m_ui.sessionLineEdit_lastfm->setText(m_lastfmAuth->session());
         else if(sender() == m_librefmAuth)
             m_ui.sessionLineEdit_librefm->setText(m_librefmAuth->session());
-        else if(sender() == m_listenbrainzAuth)
-            m_ui.sessionLineEdit_listenbrainz->setText(m_listenbrainzAuth->session());
         break;
     }
     case ScrobblerAuth::NETWORK_ERROR: