[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=4ae066e

The following commit has been merged in the master branch:
commit 4ae066ec819bce531702e197987b9312897aad6d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Apr 13 14:43:38 2014 +0200

    Fix build
---
 KTp/Declarative/conversation.cpp | 23 -----------------------
 KTp/Declarative/conversation.h   |  3 ---
 2 files changed, 26 deletions(-)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index d963a90..59329e9 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -73,14 +73,6 @@ Conversation::Conversation(const Tp::TextChannelPtr &channel,
         connect(d->targetContact.constData(), SIGNAL(aliasChanged(QString)), SIGNAL(titleChanged()));
         connect(d->targetContact.constData(), SIGNAL(presenceChanged(Tp::Presence)), SIGNAL(presenceIconChanged()));
         connect(d->targetContact.constData(), SIGNAL(avatarDataChanged(Tp::AvatarData)), SIGNAL(avatarChanged()));
-
-
-        connect(d->targetContact.constData(), SIGNAL(aliasChanged(QString)),
-                this, SLOT(onTargetContactAliasChanged(QString)));
-        connect(d->targetContact.constData(), SIGNAL(avatarDataChanged(Tp::AvatarData)),
-                this, SLOT(onTargetContactAvatarDataChanged()));
-        connect(d->targetContact.constData(), SIGNAL(presenceChanged(Tp::Presence)),
-                this, SLOT(onTargetContactPresenceChanged()));
     }
 }
 
@@ -234,21 +226,6 @@ void Conversation::onChatPausedTimerExpired()
     d->messages->textChannel()->requestChatState(Tp::ChannelChatStatePaused);
 }
 
-void Conversation::onTargetContactAvatarDataChanged()
-{
-    Q_EMIT avatarChanged(avatar());
-}
-
-void Conversation::onTargetContactAliasChanged()
-{
-    Q_EMIT titleChanged(title());
-}
-
-void Conversation::onTargetContactPresenceChanged()
-{
-    Q_EMIT presenceIconChanged(presenceIcon());
-}
-
 Conversation::~Conversation()
 {
     kDebug();
diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index c526d73..9d72d5d 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -79,9 +79,6 @@ private Q_SLOTS:
     void onAccountConnectionChanged(const Tp::ConnectionPtr &connection);
     void onCreateChannelFinished(Tp::PendingOperation *op);
     void onChatPausedTimerExpired();
-    void onTargetContactAvatarDataChanged();
-    void onTargetContactAliasChanged();
-    void onTargetContactPresenceChanged();
 
 private:
     class ConversationPrivate;

-- 
ktp-common-internals packaging