[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=85d1ea3

The following commit has been merged in the master branch:
commit 85d1ea32df6ec9cdd1dd685ee9d2a240c1affa8e
Merge: bb9aae22eed7f7445c7c6aeb5440d143bb02b3b4 590775b2c97dd6a4007d9d97a05a93e4b93e5e31
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Apr 18 15:17:44 2013 +0200

    Merge branch 'kde-telepathy-0.6'

 CMakeLists.txt                                      |  2 +-
 app/chat-window.cpp                                 |  7 ++++---
 app/chat-window.h                                   |  2 +-
 app/telepathy-chat-ui.cpp                           |  2 +-
 .../Contents/Resources/main.css                     |  1 +
 lib/logmanager.cpp                                  | 10 ++++++++++
 logviewer/message-view.cpp                          | 21 +++++++++++++++++++--
 7 files changed, 37 insertions(+), 8 deletions(-)

diff --cc logviewer/message-view.cpp
index a50fe19,a86c3ff..96ad846
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@@ -111,13 -115,47 +115,17 @@@ void MessageView::processStoredEvents(
          message.setService(m_account->serviceName());
          message.setTime(QDateTime(m_prev));
  
 -        addStatusMessage(message);
 +        addAdiumStatusMessage(message);
      }
  
+     // See https://bugs.kde.org/show_bug.cgi?id=317866
+     // Uses the operator< overload above
+     qSort(m_events);
+ 
      while (!m_events.isEmpty()) {
 -
          const Tpl::TextEventPtr textEvent(m_events.takeFirst().staticCast<Tpl::TextEvent>());
 -
 -        AdiumThemeMessageInfo::MessageType type;
 -        QString iconPath;
 -
 -        if(textEvent->sender()->identifier() == m_account->normalizedName()) {
 -            type = AdiumThemeMessageInfo::HistoryLocalToRemote;
 -            iconPath = m_accountAvatar;
 -        } else {
 -            type = AdiumThemeMessageInfo::HistoryRemoteToLocal;
 -            /* FIXME Add support for avatars in MUCs */
 -            if (m_entity->entityType() == Tpl::EntityTypeContact) {
 -                if (m_contact) {
 -                    iconPath = m_contact->avatarData().fileName;
 -                }
 -            }
 -        }
 -
 -        AdiumThemeContentInfo message(type);
 -        message.setMessage(KTp::MessageProcessor::instance()->processIncomingMessage(textEvent, m_account, Tp::TextChannelPtr()).finalizedMessage());
 -        message.setService(m_account->serviceName());
 -        message.setSenderDisplayName(textEvent->sender()->alias());
 -        message.setSenderScreenName(textEvent->sender()->identifier());
 -        message.setTime(textEvent->timestamp());
 -        message.setUserIconPath(iconPath);
 -
 -        kDebug()    << textEvent->timestamp()
 -                    << "from" << textEvent->sender()->identifier()
 -                    << "to" << textEvent->receiver()->identifier()
 -                    << textEvent->message();
 -
 -        addContentMessage(message);
 +        KTp::Message message = KTp::MessageProcessor::instance()->processIncomingMessage(textEvent, m_account, Tp::TextChannelPtr());
 +        addMessage(message);
      }
  
      if (m_next.isValid()) {

-- 
ktp-text-ui packaging