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

The following commit has been merged in the master branch:
commit acea74ef419eacb37d9053d8ba79bf17fb043969
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Mar 5 02:00:44 2013 +0000

    Don't crash log viewer
---
 KTp/message.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index 31bfec6..cbb9134 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -107,14 +107,16 @@ Message::Message(const Tpl::TextEventPtr &original, const KTp::MessageContext &c
     setProperty("senderName", original->sender()->alias());
     setProperty("senderId", original->sender()->identifier());
 
-    if (original->sender()->identifier() == context.account()->normalizedName()) {
-        d->direction = KTp::Message::LocalToRemote;
-        setProperty("senderAvatar", context.account()->
-                    connection()->selfContact()->avatarData().fileName);
-    } else {
-        d->direction = KTp::Message::RemoteToLocal;
-        setProperty("senderAvatar",
-                    context.channel()->targetContact()->avatarData().fileName);
+    if (context.account() && context.account()->connection() && context.channel()) {
+        if (original->sender()->identifier() == context.account()->normalizedName()) {
+            d->direction = KTp::Message::LocalToRemote;
+            setProperty("senderAvatar", context.account()->
+                        connection()->selfContact()->avatarData().fileName);
+        } else {
+            d->direction = KTp::Message::RemoteToLocal;
+                setProperty("senderAvatar",
+                            context.channel()->targetContact()->avatarData().fileName);
+        }
     }
 
     setMainMessagePart(original->message());

-- 
ktp-common-internals packaging