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

The following commit has been merged in the master branch:
commit b5f5929e79e587f1fa9e6600599d4af3b7026387
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 8 23:11:23 2012 +0000

    targetContact() can be null, so check before trying to use it.
    
    CCBUG: 293487
---
 KTp/Declarative/conversation-target.cpp | 31 +++++++++++++++++++++++++------
 KTp/Declarative/conversation-target.h   |  2 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index 1388613..53280d0 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -28,7 +28,7 @@ public:
     KIcon avatar;
 };
 
-ConversationTarget::ConversationTarget(Tp::ContactPtr contact, QObject *parent) :
+ConversationTarget::ConversationTarget(const Tp::ContactPtr &contact, QObject *parent) :
     QObject(parent),
     d(new ConversationTargetPrivate)
 {
@@ -51,22 +51,38 @@ void ConversationTarget::setupContactSignals(Tp::ContactPtr contact)
 
 QIcon ConversationTarget::avatar() const
 {
-    return d->avatar;
+    if (d->contact) {
+        return d->avatar;
+    } else {
+        return QIcon();
+    }
 }
 
 QString ConversationTarget::id() const
 {
-    return d->contact->id();
+    if (d->contact) {
+        return d->contact->id();
+    } else {
+        return QString();
+    }
 }
 
 QString ConversationTarget::nick() const
 {
-    return d->contact->alias();
+    if (d->contact) {
+        return d->contact->alias();
+    } else {
+        return QString();
+    }
 }
 
 QIcon ConversationTarget::presenceIcon() const
 {
-    return KTp::Presence(d->contact->presence()).icon();
+    if (d->contact) {
+        return KTp::Presence(d->contact->presence()).icon();
+    } else {
+        return QIcon();
+    }
 }
 
 void ConversationTarget::onPresenceChanged(const Tp::Presence&)
@@ -82,7 +98,10 @@ void ConversationTarget::onAvatarDataChanged(const Tp::AvatarData&)
 
 void ConversationTarget::updateAvatar()
 {
-    QString path = d->contact->avatarData().fileName;
+    QString path;
+    if (d->contact) {
+        path = d->contact->avatarData().fileName;
+    }
 
     if(path.isEmpty()) {
         path = QLatin1String("im-user");
diff --git a/KTp/Declarative/conversation-target.h b/KTp/Declarative/conversation-target.h
index f2fee63..7acde40 100644
--- a/KTp/Declarative/conversation-target.h
+++ b/KTp/Declarative/conversation-target.h
@@ -38,7 +38,7 @@ class KDE_TELEPATHY_CHAT_EXPORT ConversationTarget : public QObject
     Q_PROPERTY(QString id READ id)
 
 public:
-    ConversationTarget(Tp::ContactPtr contact, QObject *parent = 0);
+    ConversationTarget(const Tp::ContactPtr &contact, QObject *parent = 0);
     virtual ~ConversationTarget();
 
     QIcon   avatar() const;

-- 
ktp-common-internals packaging