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

The following commit has been merged in the master branch:
commit e1c9a11ebcac3cc5a5188402d167b479e185179a
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Mar 14 19:35:41 2012 +0100

    Compile
---
 KTp/Declarative/contact-list.cpp | 28 +++++++++++++---------------
 KTp/Declarative/contact-list.h   |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/KTp/Declarative/contact-list.cpp b/KTp/Declarative/contact-list.cpp
index c5c7e29..b07cfa3 100644
--- a/KTp/Declarative/contact-list.cpp
+++ b/KTp/Declarative/contact-list.cpp
@@ -24,15 +24,15 @@
 #include <QtDeclarative/QDeclarativeEngine>
 #include <QtDeclarative/QDeclarativeContext>
 
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingReady>
 
 #include "flat-model-proxy.h"
 
-#include <KTelepathy/Models/accounts-model.h>
+#include <KTp/Models/accounts-model.h>
 
 
 
@@ -44,7 +44,7 @@ TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList&
     // set plasmoid size
     setMinimumSize(250, 400);
     setAspectRatioMode(Plasma::IgnoreAspectRatio);
-    
+
     Tp::registerTypes();
 
         // Start setting up the Telepathy AccountManager.
@@ -65,9 +65,9 @@ TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList&
                                                                       << Tp::Contact::FeatureAvatarData
                                                                       << Tp::Contact::FeatureSimplePresence
                                                                       << Tp::Contact::FeatureCapabilities);
-    
-    
-    
+
+
+
     Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
 
      m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
@@ -79,10 +79,6 @@ TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList&
     connect(m_accountManager->becomeReady(),
             SIGNAL(finished(Tp::PendingOperation*)),
             SLOT(onAccountManagerReady(Tp::PendingOperation*)));
-
-    m_model = new AccountsModel(m_accountManager, this);
-
-    
 }
 
 TelepathyContactList::~TelepathyContactList()
@@ -133,5 +129,7 @@ K_EXPORT_PLASMA_APPLET(telepathy-contact-list, TelepathyContactList)
 
 void TelepathyContactList::onAccountManagerReady(Tp::PendingOperation *op)
 {
-    m_model->init();
+    m_model = new AccountsModel(this);
+    m_model->setAccountManager(m_accountManager);
+    init();
 }
diff --git a/KTp/Declarative/contact-list.h b/KTp/Declarative/contact-list.h
index ae095a1..6054801 100644
--- a/KTp/Declarative/contact-list.h
+++ b/KTp/Declarative/contact-list.h
@@ -23,7 +23,7 @@
 #include <Plasma/Applet>
 #include <Plasma/DeclarativeWidget>
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 class AccountsModel;
 

-- 
ktp-common-internals packaging