[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=4cb7a67

The following commit has been merged in the master branch:
commit 4cb7a6754a08f50257859384121d1f18bf5689c4
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Jan 10 12:48:15 2012 +1100

    Made presenceIcon() in ConversationTarget use KTp::Presence instead of Tp::Presence directly.
---
 KTp/Declarative/conversation-target.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index 38db4f0..9997dc8 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -70,7 +70,7 @@ QString ConversationTarget::nick() const
 
 KIcon ConversationTarget::presenceIcon() const
 {
-    return KIcon(presenceIconSource());
+    return KTp::Presence(d->contact->presence()).icon();
 }
 
 QString ConversationTarget::presenceIconSource() const

-- 
ktp-common-internals packaging