[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=807e466

The following commit has been merged in the master branch:
commit 807e466d988cde8559b736ab41e97beeacd167f4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Oct 2 14:56:16 2010 +0000

    Rename updateChatStatus to onChatStateChanged for consistency with other
    similar slots.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1181859
---
 lib/chatwindow.cpp | 2 --
 lib/chatwindow.h   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index e4e1ab4..0ad1bc1 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -233,8 +233,6 @@ void ChatWindow::updateChatStatus(Tp::ContactPtr contact, ChannelChatState state
     case ChannelChatStateComposing:
         ui->statusLabel->setText(i18n("%1 is typing a message").arg(contact->alias()));
     }
-
-
 }
 
 
diff --git a/lib/chatwindow.h b/lib/chatwindow.h
index e42c8e5..cf902f7 100644
--- a/lib/chatwindow.h
+++ b/lib/chatwindow.h
@@ -75,7 +75,7 @@ protected slots:
     /** Enable/Disable buttons in the chat window*/
     void updateEnabledState(bool enabled);
 
-    void updateChatStatus(Tp::ContactPtr contact, ChannelChatState state);
+    void onChatStatusChanged(Tp::ContactPtr contact, ChannelChatState state);
 
     void onContactPresenceChange(Tp::ContactPtr, uint type);
 

-- 
ktp-text-ui packaging