[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=866c00f

The following commit has been merged in the master branch:
commit 866c00fe53cc6af418cc61a606ff696aa9ac12aa
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Sep 1 15:12:15 2012 +0100

    Add guards in message-view for null pointers
    
    Reviewed-by: Dan Vratil
---
 logviewer/message-view.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/logviewer/message-view.cpp b/logviewer/message-view.cpp
index 9931b6a..012c3b7 100644
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@ -41,6 +41,13 @@ void MessageView::loadLog(const Tp::AccountPtr &account, const Tpl::EntityPtr &e
                           const Tp::ContactPtr &contact, const QDate &date,
                           const QPair< QDate, QDate > &nearestDates)
 {
+
+    if (account.isNull() || entity.isNull()) {
+        //note contact can be null
+        kWarning() << "invalid account/contact. Not loading log";
+        return;
+    }
+    
     m_account = account;
     m_entity = entity;
     m_contact = contact;
@@ -96,7 +103,7 @@ void MessageView::onEventsLoaded(Tpl::PendingOperation *po)
         headerInfo.setChatName(m_contact.isNull() ? m_entity->alias() : m_contact->alias());
         headerInfo.setGroupChat(m_entity->entityType() == Tpl::EntityTypeRoom);
         headerInfo.setSourceName(m_account->displayName());
-        headerInfo.setIncomingIconPath(m_contact->avatarData().fileName);
+        headerInfo.setIncomingIconPath(m_contact.isNull() ? QString() : m_contact->avatarData().fileName);
 
         if (pe->events().count() > 0 && !pe->events().first().isNull()) {
             headerInfo.setTimeOpened(pe->events().first()->timestamp());
@@ -141,7 +148,9 @@ void MessageView::processStoredEvents()
             type = AdiumThemeMessageInfo::HistoryRemoteToLocal;
             /* FIXME Add support for avatars in MUCs */
             if (m_entity->entityType() == Tpl::EntityTypeContact) {
-                iconPath = m_contact->avatarData().fileName;
+                if (m_contact) {
+                    iconPath = m_contact->avatarData().fileName;
+                }
             }
         }
 

-- 
ktp-text-ui packaging