[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=5a69f88

The following commit has been merged in the master branch:
commit 5a69f88b0da19875843973db159f13c6aeb6efa7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Nov 21 14:41:48 2012 +0100

    Use account service name if available
    
    This will get us prettier names of the networks
    like "google-talk" or "facebook" instead of just "jabber".
---
 kpeople/nepomuk-feeder/account.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kpeople/nepomuk-feeder/account.cpp b/kpeople/nepomuk-feeder/account.cpp
index a1ef2ad..793662f 100644
--- a/kpeople/nepomuk-feeder/account.cpp
+++ b/kpeople/nepomuk-feeder/account.cpp
@@ -56,11 +56,12 @@ void Account::init()
             SIGNAL(connectionChanged(Tp::ConnectionPtr)),
             SLOT(onConnectionChanged(Tp::ConnectionPtr)));
 
+    QString protocolName = m_account->serviceName().isEmpty() ? m_account->protocolName() : m_account->serviceName();
     // Emit a signal to notify the storage that a new account has been constructed
     // FIXME: Some IM Accounts don't have an ID as such, e.g. Link-Local-XMPP.
     emit created(m_account->objectPath(),
                  m_account->parameters().value(QLatin1String("account")).toString(),
-                 m_account->protocolName());
+                 protocolName);
 
     // Simulate all the accounts properties being changed.
     onCurrentPresenceChanged(m_account->currentPresence());

-- 
ktp-common-internals packaging