[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=0bac147

The following commit has been merged in the master branch:
commit 0bac14720e673183050529488e3ddc5f50872b83
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 16 17:40:50 2015 +0100

    [kaccounts] Don't crash on null profile
    
    When the user selects an account for which an invalid Telepathy profile
    exists, things should not crash but rather just warn the user.
    
    As this plugin is now under string freeze, I've copied a string from the
    old kcm (as it uses the same catalog), it's not ideal but this does not
    violate string freeze and gives user at least a hint of what he should
    do.
    
    BUG: 344594
---
 plugins/kaccounts/kaccounts-ui-provider.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index ffd2ddb..e9e60dd 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -136,6 +136,11 @@ void KAccountsUiProvider::onProfileManagerReady(Tp::PendingOperation *op)
 
     d->profile = d->profileManager->profileForService(d->profileName);
 
+    if (d->profile.isNull()) {
+        Q_EMIT  error(i18n("To connect to this IM network, you need to install additional plugins. Please install the telepathy-haze and telepathy-gabble packages using your package manager."));
+        return;
+    }
+
     d->connectionManager = Tp::ConnectionManager::create(d->profile->cmName());
     connect(d->connectionManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)),
             this, SLOT(onConnectionManagerReady(Tp::PendingOperation*)));

-- 
ktp-accounts-kcm packaging