[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b53a41e

The following commit has been merged in the master branch:
commit b53a41e8f4adb0691941ce4cf2955f2ac03e620e
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Feb 7 07:57:14 2012 +1100

    Rename slot in ConversationsModel
    
    Renamed ConversationsModel::invalidate() to
    ConversationsModel::onChannelInvalidated() becuase the purpose of
    that function was unclear in the previous name.
---
 KTp/Declarative/conversation.cpp | 4 ++--
 KTp/Declarative/conversation.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 48193dc..c2f707a 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -47,7 +47,7 @@ Conversation::Conversation(const Tp::TextChannelPtr& channel,
 
     d->valid = channel->isValid();
     connect(channel.data(), SIGNAL(invalidated(Tp::DBusProxy*,QString,QString)),
-            SLOT(invalidate(Tp::DBusProxy*,QString,QString)));
+            SLOT(onChannelInvalidated(Tp::DBusProxy*,QString,QString)));
 }
 
 Conversation::Conversation(QObject *parent) : QObject(parent)
@@ -71,7 +71,7 @@ bool Conversation::isValid()
     return d->valid;
 }
 
-void Conversation::invalidate(Tp::DBusProxy* proxy, const QString& errorName, const QString& errorMessage)
+void Conversation::onChannelInvalidated(Tp::DBusProxy* proxy, const QString& errorName, const QString& errorMessage)
 {
     kDebug() << proxy << errorName << ":" << errorMessage;
 
diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 3c491c7..78fd38d 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -57,7 +57,7 @@ public Q_SLOTS:
     void requestClose();
 
 private Q_SLOTS:
-    void invalidate(Tp::DBusProxy *proxy, const QString &errorName, const QString &errorMessage);
+    void onChannelInvalidated(Tp::DBusProxy *proxy, const QString &errorName, const QString &errorMessage);
 
 private:
     class ConversationPrivate;

-- 
ktp-common-internals packaging