[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=10f0e45

The following commit has been merged in the master branch:
commit 10f0e450d112a41fb395df8f8b5a574e09989da9
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Aug 31 16:13:20 2012 +0200

    Do not use an extra variable
---
 lib/logmanager.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index 943feb5..1377c6f 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -173,7 +173,6 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
     QList<AdiumThemeContentInfo> messages;
     Q_FOREACH(const Tpl::TextEventPtr &event, events) {
         AdiumThemeMessageInfo::MessageType type;
-        QString iconPath;
         Tp::ContactPtr contact;
         if(event->sender()->identifier() == m_account->normalizedName()) {
             type = AdiumThemeMessageInfo::HistoryLocalToRemote;
@@ -184,8 +183,6 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
             type = AdiumThemeMessageInfo::HistoryRemoteToLocal;
             contact = m_textChannel->targetContact();
         }
-        iconPath = contact->avatarData().fileName;
-
         AdiumThemeContentInfo message(type);
 
         message.setMessage(MessageProcessor::instance()->processIncomingMessage(event).finalizedMessage());
@@ -193,7 +190,7 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
         message.setSenderDisplayName(event->sender()->alias());
         message.setSenderScreenName(event->sender()->alias());
         message.setTime(event->timestamp());
-        message.setUserIconPath(iconPath);
+        message.setUserIconPath(contact->avatarData().fileName);
         kDebug()    << event->timestamp()
                     << "from" << event->sender()->identifier()
                     << "to" << event->receiver()->identifier()

-- 
ktp-text-ui packaging