[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=b5848a6

The following commit has been merged in the master branch:
commit b5848a6a490943331581a1fc76e6a71d85069f89
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Nov 14 17:32:39 2014 +0100

    Replace the kcm_ktp_accounts with kcm_kaccounts
    
    This way it doesn't pop an error and it shows the relevant information,
    it looks a bit weird though.
    
    Reviewed by David Edmundson
    
    CCMAIL: mklapetek at kde.org
---
 KTp/Widgets/settings-kcm-dialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/Widgets/settings-kcm-dialog.cpp b/KTp/Widgets/settings-kcm-dialog.cpp
index c24980d..723d9b2 100644
--- a/KTp/Widgets/settings-kcm-dialog.cpp
+++ b/KTp/Widgets/settings-kcm-dialog.cpp
@@ -34,14 +34,14 @@ SettingsKcmDialog::SettingsKcmDialog(QWidget *parent) :
     setAttribute(Qt::WA_DeleteOnClose);
     resize(700, 640);
 
-    KService::Ptr tpAccKcm = KService::serviceByDesktopName(QLatin1String("kcm_ktp_accounts"));
+    KService::Ptr tpAccKcm = KService::serviceByDesktopName(QStringLiteral("kcm_kaccounts"));
     if (!tpAccKcm) {
         KMessageBox::error(this,
-                           i18n("It appears you do not have the IM Accounts control module installed. Please install ktp-accounts-kcm package."),
+                           i18n("It appears you do not have the IM Accounts control module installed. Please install kaccounts-integration package."),
                            i18n("IM Accounts KCM Plugin Is Not Installed"));
     }
 
-    addModule(QLatin1String("kcm_ktp_accounts"));
+    addModule(QStringLiteral("kcm_kaccounts"));
 }
 
 void SettingsKcmDialog::addGeneralSettingsModule()

-- 
ktp-common-internals packaging