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

The following commit has been merged in the master branch:
commit ce5d838f977a58786682fdb6e31936e58bbe2135
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Mar 14 20:47:59 2012 +0000

    Don't randomly call init twice, it's called by plasma. We shouldn't do it ourselves.
    
    Fixes crash
---
 KTp/Declarative/contact-list.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/KTp/Declarative/contact-list.cpp b/KTp/Declarative/contact-list.cpp
index 2d844df..cf68d2e 100644
--- a/KTp/Declarative/contact-list.cpp
+++ b/KTp/Declarative/contact-list.cpp
@@ -81,8 +81,6 @@ TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList&
     
     m_model = new AccountsModel(this);
     m_proxyModel = new FlatModelProxy(m_model);
-
-
 }
 
 TelepathyContactList::~TelepathyContactList()
@@ -111,7 +109,6 @@ void TelepathyContactList::init()
 
         // make C++ Plasma::Applet available to QML for resize signal
         m_declarative->engine()->rootContext()->setContextProperty("TelepathyContactList", this);
-
         m_declarative->engine()->rootContext()->setContextProperty("contactListModel", m_proxyModel);
 
         // setup qml object so that we can talk to the declarative part
@@ -133,5 +130,4 @@ K_EXPORT_PLASMA_APPLET(telepathy-contact-list, TelepathyContactList)
 void TelepathyContactList::onAccountManagerReady(Tp::PendingOperation *op)
 {
     m_model->setAccountManager(m_accountManager);
-    init();
 }

-- 
ktp-common-internals packaging