[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=50955a1

The following commit has been merged in the master branch:
commit 50955a1e5eaeb490b156c8ca3057a75eb0e4d3aa
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Jun 2 15:34:11 2015 +0200

    [kaccounts] Add special handling for Google accounts when migrating logs
---
 kaccounts/kaccounts-ktp-plugin.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/kaccounts/kaccounts-ktp-plugin.cpp b/kaccounts/kaccounts-ktp-plugin.cpp
index 82161f9..2751b38 100644
--- a/kaccounts/kaccounts-ktp-plugin.cpp
+++ b/kaccounts/kaccounts-ktp-plugin.cpp
@@ -209,10 +209,15 @@ void KAccountsKTpPlugin::Private::migrateLogs(const QString &tpAccountId, const
 
     // Construct the new dir which is in form "$cmName_$protocol_ktp_2d$service_name_$KAccountsID"
     // eg. haze_icq_ktp_2d_haze_2dicq_2dim_24
-    QString newLogsDir = tpAccount->cmName() + QStringLiteral("_")
-                           + tpAccount->protocolName() + QStringLiteral("_")
-                           + Tp::escapeAsIdentifier(QStringLiteral("ktp-") + tpAccount->serviceName())
-                           + QStringLiteral("_") + QString::number(accountId);
+    QString newLogsDir = tpAccount->cmName() + QLatin1Char('_') + tpAccount->protocolName() + QLatin1Char('_');
+
+    if (tpAccount->serviceName() == QLatin1String("google-talk")) {
+        newLogsDir += QStringLiteral("google_2dim");
+    } else {
+        newLogsDir += Tp::escapeAsIdentifier(QStringLiteral("ktp-") + tpAccount->serviceName());
+    }
+
+    newLogsDir += QLatin1Char('_') + QString::number(accountId);
 
     QString accountLogsDir = tpAccount->uniqueIdentifier();
 

-- 
ktp-common-internals packaging