[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=f7f347e

The following commit has been merged in the master branch:
commit f7f347e2f9351a9abdcd06960f40383772651a9c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Apr 5 20:11:30 2012 +0200

    Remove old "token" entry if present
---
 x-messenger-oauth2-auth-operation.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/x-messenger-oauth2-auth-operation.cpp b/x-messenger-oauth2-auth-operation.cpp
index 518367c..59c318d 100644
--- a/x-messenger-oauth2-auth-operation.cpp
+++ b/x-messenger-oauth2-auth-operation.cpp
@@ -34,6 +34,13 @@ XMessengerOAuth2AuthOperation::XMessengerOAuth2AuthOperation(
     m_account(account),
     m_saslIface(saslIface)
 {
+    // NOTE Remove old "token" wallet entry
+    // This entry was used in ktp 0.3, and it is now replaced by "access_token"
+    // FIXME We might want to remove this in a later ktp version
+    if (KTp::WalletInterface::hasEntry(m_account, QLatin1String("token"))) {
+        KTp::WalletInterface::removeEntry(m_account, QLatin1String("token"));
+    }
+
     connect(m_saslIface,
             SIGNAL(SASLStatusChanged(uint,QString,QVariantMap)),
             SLOT(onSASLStatusChanged(uint,QString,QVariantMap)));

-- 
ktp-auth-handler packaging