[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=30b0282

The following commit has been merged in the master branch:
commit 30b0282f0be5efb6c1009ef811b4844dfb3e65d4
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Nov 12 10:35:17 2012 +0100

    Fix switching contacts in global search results
    
    Also fix a potential crash
    
    REVIEW: 107273
---
 logviewer/conversation-date-picker.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/logviewer/conversation-date-picker.cpp b/logviewer/conversation-date-picker.cpp
index be43bb3..4c98129 100644
--- a/logviewer/conversation-date-picker.cpp
+++ b/logviewer/conversation-date-picker.cpp
@@ -43,6 +43,7 @@ void ConversationDatePicker::setEntity(const Tp::AccountPtr &account, const Tpl:
     if (!m_searchHits.isEmpty()) {
         setDatesFromSearchHits();
         updatePaintedDates();
+	Q_EMIT dateChanged(date());
     } else {
         Tpl::LogManagerPtr logManager = Tpl::LogManager::instance();
         Tpl::PendingDates *pendingDates = logManager->queryDates(account, entity, Tpl::EventTypeMaskText);
@@ -131,6 +132,10 @@ void ConversationDatePicker::setDatesFromSearchHits()
     }
 
     Q_FOREACH (const Tpl::SearchHit &searchHit, m_searchHits) {
+	if (searchHit.account().isNull() || searchHit.target().isNull()) {
+	    continue;
+	}
+
         if ((searchHit.account()->uniqueIdentifier() == m_account->uniqueIdentifier()) &&
             (searchHit.target()->identifier() == m_entity->identifier())) {
                 m_setDates << searchHit.date();

-- 
ktp-text-ui packaging