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

The following commit has been merged in the master branch:
commit eb100db74cc1e8e732e0887abfa7b6db2d85ab8c
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Feb 5 11:08:46 2012 +1100

    Move registrar from ConversationClientObserver to TelepathyTextObserver
---
 KTp/Declarative/telepathy-text-observer.cpp | 8 ++------
 KTp/Declarative/telepathy-text-observer.h   | 7 ++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/KTp/Declarative/telepathy-text-observer.cpp b/KTp/Declarative/telepathy-text-observer.cpp
index 29dc808..60ecd0d 100644
--- a/KTp/Declarative/telepathy-text-observer.cpp
+++ b/KTp/Declarative/telepathy-text-observer.cpp
@@ -72,7 +72,6 @@ public:
     }
 
     TelepathyTextObserver *m_parent;
-    Tp::ClientRegistrarPtr registrar;
 };
 
 TelepathyTextObserver::TelepathyTextObserver() :
@@ -108,12 +107,9 @@ TelepathyTextObserver::TelepathyTextObserver() :
     );
 
     //TODO: check these to make sure I'm only requesting features I actually use.
-    observer
-->registrar = Tp::ClientRegistrar::create(accountFactory, connectionFactory,
+    m_registrar = Tp::ClientRegistrar::create(accountFactory, connectionFactory,
                                             channelFactory, contactFactory);
-    observer
-->registrar->registerClient(observer
-, QLatin1String("KDE.TextUi.ConversationWatcher"));
+    m_registrar->registerClient(observer, QLatin1String("KDE.TextUi.ConversationWatcher"));
 }
 
 TelepathyTextObserver::~TelepathyTextObserver()
diff --git a/KTp/Declarative/telepathy-text-observer.h b/KTp/Declarative/telepathy-text-observer.h
index 5368875..6658ee5 100644
--- a/KTp/Declarative/telepathy-text-observer.h
+++ b/KTp/Declarative/telepathy-text-observer.h
@@ -35,10 +35,11 @@ public:
     ~TelepathyTextObserver();
 
 Q_SIGNALS:
-	void newConversation(Conversation *con);
+    void newConversation(Conversation *con);
 private:
-	class ConversationClientObserver;
-	Tp::SharedPtr<ConversationClientObserver> observer;
+    class ConversationClientObserver;
+    Tp::SharedPtr<ConversationClientObserver> observer;
+    Tp::ClientRegistrarPtr m_registrar;
 };
 
 #endif // CONVERSATION_WATCHER_H

-- 
ktp-common-internals packaging