[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=9a647be

The following commit has been merged in the master branch:
commit 9a647be79dcea3bd551c92df251663c49c08a0f9
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
---
 src/telepathyContactList.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/telepathyContactList.cpp b/src/telepathyContactList.cpp
index 2d844df..cf68d2e 100644
--- a/src/telepathyContactList.cpp
+++ b/src/telepathyContactList.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-contact-applet packaging