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

The following commit has been merged in the master branch:
commit e9cb405edb60a4efdf37fb7e9ee80e45758f8bef
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 29 13:18:23 2012 +0000

    Minor fixes in log viewer
    
    REVIEW: 103820
    BUG: 246011
---
 logviewer/entity-model.cpp | 5 +----
 logviewer/entity-model.h   | 4 ----
 logviewer/log-viewer.cpp   | 2 +-
 logviewer/log-viewer.h     | 3 ---
 logviewer/message-view.cpp | 9 +++------
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/logviewer/entity-model.cpp b/logviewer/entity-model.cpp
index 419b376..1f092ce 100644
--- a/logviewer/entity-model.cpp
+++ b/logviewer/entity-model.cpp
@@ -30,8 +30,7 @@ int EntityModel::rowCount(const QModelIndex &parent) const
 {
     if (parent == QModelIndex()) {
         return m_entities.size();
-    }
-    else {
+    } else {
         return 0;
     }
 }
@@ -74,8 +73,6 @@ void EntityModel::onEntitiesSearchFinished(Tpl::PendingOperation *operation)
             item.account = pendingEntities->account();
             item.entity = entity;
 
-            qDebug() << entity->alias();
-
             m_entities.append(item);
         }
 
diff --git a/logviewer/entity-model.h b/logviewer/entity-model.h
index adf9b88..70d2ef1 100644
--- a/logviewer/entity-model.h
+++ b/logviewer/entity-model.h
@@ -49,10 +49,6 @@ public:
     int rowCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;
 
-Q_SIGNALS:
-
-public Q_SLOTS:
-
 private Q_SLOTS:
     void onEntitiesSearchFinished(Tpl::PendingOperation*);
 
diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index e235dd4..62932a2 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -30,7 +30,7 @@ LogViewer::LogViewer(QWidget *parent) :
 
     ui->entityList->setModel(m_entityModel);
 
-    //TODO parse args and update all views as appropriate
+    //TODO parse command line args and update all views as appropriate
 
     connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAccountManagerReady()));
     connect(ui->entityList, SIGNAL(activated(QModelIndex)), SLOT(onEntitySelected(QModelIndex)));
diff --git a/logviewer/log-viewer.h b/logviewer/log-viewer.h
index cd65393..d314fad 100644
--- a/logviewer/log-viewer.h
+++ b/logviewer/log-viewer.h
@@ -25,10 +25,7 @@ private Q_SLOTS:
 
     void updateMainView();
 
-
 private:
-
-
     Ui::LogViewer *ui;
     Tp::AccountManagerPtr m_accountManager;
     EntityModel *m_entityModel;
diff --git a/logviewer/message-view.cpp b/logviewer/message-view.cpp
index 9a5eae8..d9cf85c 100644
--- a/logviewer/message-view.cpp
+++ b/logviewer/message-view.cpp
@@ -22,21 +22,20 @@ void MessageView::loadLog(const Tp::AccountPtr &account, const Tpl::EntityPtr &e
     m_entity = entity;
     m_date = date;
 
-    //FIXME check entity type
+    //FIXME check entity type, set as appropriately.
     load(AdiumThemeView::SingleUserChat);
 
 
     AdiumThemeHeaderInfo headerInfo;
     headerInfo.setDestinationDisplayName(m_entity->alias());
     headerInfo.setChatName(m_entity->alias());
-//  other headerInfo here.
+    //  TODO set up other headerInfo here.
     initialise(headerInfo);
 }
 
 void MessageView::onLoadFinished()
 {
     //load stuff here.
-    qDebug() << "load stuff";
     Tpl::LogManagerPtr logManager = Tpl::LogManager::instance();
     Tpl::PendingEvents *pendingEvents  = logManager->queryEvents(m_account, m_entity, Tpl::EventTypeMaskText, m_date);
     connect(pendingEvents, SIGNAL(finished(Tpl::PendingOperation*)), SLOT(onEventsLoaded(Tpl::PendingOperation*)));
@@ -48,8 +47,6 @@ void MessageView::onEventsLoaded(Tpl::PendingOperation *po)
 
     QList<AdiumThemeContentInfo> messages;
 
-    qDebug() << "showing " << pe->events().size() << "messages";
-
     Q_FOREACH(const Tpl::EventPtr &event, pe->events()) {
         const Tpl::TextEventPtr textEvent(event.staticCast<Tpl::TextEvent>());
 
@@ -67,7 +64,7 @@ void MessageView::onEventsLoaded(Tpl::PendingOperation *po)
         message.setMessage(textEvent->message());
         message.setService(m_account->serviceName());
         message.setSenderDisplayName(textEvent->sender()->alias());
-        message.setSenderScreenName(textEvent->sender()->alias());
+        message.setSenderScreenName(textEvent->sender()->identifier());
         message.setTime(textEvent->timestamp());
         message.setUserIconPath(iconPath);
         kDebug()    << textEvent->timestamp()

-- 
ktp-text-ui packaging