[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=2e3f9e4

The following commit has been merged in the master branch:
commit 2e3f9e499597776b28be3fd285945084cade5115
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Wed Mar 30 20:36:31 2011 +0530

    Follow upstream shared-desktop-ontologies changes
    Reviewed By: David Edmundson and Dario Freddi
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 7cf424a..6ac4fc1 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -429,7 +429,7 @@ void NepomukStorage::createContact(const QString &path, const QString &id)
     newImAccount.setImStatus("unknown");
     newImAccount.setImIDs(QStringList() << id);
     newImAccount.setStatusTypes(QList<long long int>() << Tp::ConnectionPresenceTypeUnknown);
-    newImAccount.setImAccountTypes(QStringList() << account.imAccountTypes().first());
+    newImAccount.setImAccountType(account.imAccountType());
 
     newImAccount.addIsAccessedBy(account);
 
@@ -501,12 +501,7 @@ void NepomukStorage::setContactPresence(const QString &path,
     imAccount.setImStatus(presence.status);
     imAccount.setStatusTypes(QList<long long int>() << presence.type);
 
-    QStringList statusMessage;
-    if (!presence.statusMessage.isEmpty()) {
-        statusMessage.append(presence.statusMessage);
-    }
-
-    imAccount.setImStatusMessages(statusMessage);
+    imAccount.setImStatusMessage(presence.statusMessage);
 }
 
 void NepomukStorage::setContactGroups(const QString &path,
@@ -589,7 +584,7 @@ void NepomukStorage::setContactBlockStatus(const QString &path, const QString &i
     Nepomuk::IMAccount imAccount = resources.imAccount();
 
     // Set the blocked status.
-    imAccount.setIsBlockeds(QList<bool>() << blocked);
+    imAccount.setIsBlocked(blocked);
 }
 
 void NepomukStorage::setContactPublishState(const QString &path,

-- 
ktp-common-internals packaging