[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=7035a51

The following commit has been merged in the master branch:
commit 7035a5198900521cdd2bbc6e1be869214f66a807
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Sep 18 17:47:42 2010 +0000

    set timestamp of user group presence change
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1176791
---
 lib/channelcontactlist.cpp | 2 +-
 lib/chatwindow.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/channelcontactlist.cpp b/lib/channelcontactlist.cpp
index e73bbf1..b1eaddd 100644
--- a/lib/channelcontactlist.cpp
+++ b/lib/channelcontactlist.cpp
@@ -4,7 +4,7 @@
 /** reif This class provides an abstracted way of getting presence changes from a contact
   * It was needed to be able to pair up a contact changing, with the name of the contact.
   * It gives a single signal for the calling code to handle for every contact, and
-  * also safetly handles connect and disconnecting slots as contacts enter and leave a channel (future).
+  * also safetly handles connect and disconnecting slots as contacts enter and leave a channel
 */
 
 /** Internal private class*/
diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index fad1d73..d0bdedd 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -177,6 +177,7 @@ void ChatWindow::onContactPresenceChange(Tp::ContactPtr contact, uint type)
     if (!message.isNull()) {
         TelepathyChatMessageInfo statusMessage(TelepathyChatMessageInfo::Status);
         statusMessage.setMessage(message);
+        statusMessage.setTime(QDateTime::currentDateTime());
         ui->chatArea->addMessage(statusMessage);
     }
 
@@ -208,7 +209,6 @@ void ChatWindow::updateEnabledState(bool enable)
                     info.setDestinationName(it->id());
                     info.setChatName(it->alias());
                     info.setIncomingIconPath(it->avatarToken());
-
                 }
             }
         } else {

-- 
ktp-text-ui packaging