[prev in list] [next in list] [prev in thread] [next in thread] 

List:       amarok-bugs-dist
Subject:    [Bug 235861] last.fm username and password won't be saved (without
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2010-09-04 13:43:13
Message-ID: 20100904134313.8B2E364EFE () immanuel ! kde ! org
[Download RAW message or body]

https://bugs.kde.org/show_bug.cgi?id=235861


Mark Kretschmann <kretschmann@kde.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




--- Comment #16 from Mark Kretschmann <kretschmann kde org>  2010-09-04 15:43:11 ---
commit 0a7a673fe2b1dfda7489b19e4f792a2359e81e62
Author: Mark Kretschmann <kretschmann@kde.org>
Date:   Sat Sep 4 15:37:07 2010 +0200

    Make the Last.fm service work without KWallet.

    This was broken because the wrong signals were used in the confirmation
dialog.

    BUG: 235861

diff --git a/ChangeLog b/ChangeLog
index 2c95b9a..39f132d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ VERSION 2.3.2
     * Use system date/time format for default name when saving user playlists.

   BUGFIXES:
+    * The Last.fm service did not work without KWallet. (BR 235861)
     * Show actual KDE version in the "About Amarok" dialog, instead of the
       version used at compile time.
     * Fixed a crash when trying to save a playlist to a file where the format
diff --git a/src/services/lastfm/LastFmServiceConfig.cpp
b/src/services/lastfm/LastFmServiceConfig.cpp
index 6847a33..6ac3ff6 100644
--- a/src/services/lastfm/LastFmServiceConfig.cpp
+++ b/src/services/lastfm/LastFmServiceConfig.cpp
@@ -50,6 +50,8 @@ LastFmServiceConfig::LastFmServiceConfig()

 LastFmServiceConfig::~LastFmServiceConfig()
 {
+    DEBUG_BLOCK
+
     if( m_askDiag )
         m_askDiag->deleteLater();
     if( m_wallet )
@@ -141,8 +143,8 @@ LastFmServiceConfig::askAboutMissingKWallet()
         m_askDiag->setButtons( KDialog::Yes | KDialog::No );
         m_askDiag->setModal( true );

-        connect( m_askDiag, SIGNAL( okClicked() ), this, SLOT( textDialogOK()
) );
-        connect( m_askDiag, SIGNAL( cancelClicked() ), this, SLOT(
textDialogCancel() ) );
+        connect( m_askDiag, SIGNAL( yesClicked() ), this, SLOT(
textDialogYes() ) );
+        connect( m_askDiag, SIGNAL( noClicked() ), this, SLOT( textDialogNo()
) );
     }
     m_askDiag->exec();
 }
@@ -161,8 +163,10 @@ LastFmServiceConfig::reset()


 void
-LastFmServiceConfig::textDialogOK()
+LastFmServiceConfig::textDialogYes() //SLOT
 {
+    DEBUG_BLOCK
+
     KConfigGroup config = KGlobal::config()->group( configSectionName() );
     config.writeEntry( "ignoreWallet", "yes" );
     config.sync();
@@ -170,8 +174,10 @@ LastFmServiceConfig::textDialogOK()


 void
-LastFmServiceConfig::textDialogCancel()
+LastFmServiceConfig::textDialogNo() //SLOT
 {
+    DEBUG_BLOCK
+
     KConfigGroup config = KGlobal::config()->group( configSectionName() );
     config.writeEntry( "ignoreWallet", "no" );
     config.sync();
diff --git a/src/services/lastfm/LastFmServiceConfig.h
b/src/services/lastfm/LastFmServiceConfig.h
index 642410e..99b46c2 100644
--- a/src/services/lastfm/LastFmServiceConfig.h
+++ b/src/services/lastfm/LastFmServiceConfig.h
@@ -57,8 +57,8 @@ public:
     void setFetchSimilar( bool fetchSimilar ) { m_fetchSimilar = fetchSimilar;
}

 private slots:
-    void textDialogOK();
-    void textDialogCancel();
+    void textDialogYes();
+    void textDialogNo();

 private:
     void askAboutMissingKWallet();

-- 
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
_______________________________________________
Amarok-bugs-dist mailing list
Amarok-bugs-dist@kde.org
https://mail.kde.org/mailman/listinfo/amarok-bugs-dist
[prev in list] [next in list] [prev in thread] [next in thread]