[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=3f26377

The following commit has been merged in the master branch:
commit 3f26377779dc2e65d97211d4668404525e3fd3f8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Feb 27 16:40:05 2011 +0000

    Only create one account model.
    Previous code created multiple instances by accident.
---
 main-widget.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index da6f255..4138b93 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -363,6 +363,9 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
         kDebug() << op->errorMessage();
     }
     
+    m_model = new AccountsModel(m_accountManager, this);
+    m_contactsListView->setModel(m_model);
+
     QList<Tp::AccountPtr> accounts = m_accountManager->allAccounts();
     foreach (Tp::AccountPtr account, accounts) 
     {
@@ -380,10 +383,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
 
             AccountButton *bt = new AccountButton(account, this);
 
-            m_accountButtonsLayout->addWidget(bt);
-            
-            m_model = new AccountsModel(m_accountManager, this);
-            m_contactsListView->setModel(m_model);            
+            m_accountButtonsLayout->addWidget(bt);         
         }
     }
     
@@ -1197,4 +1197,4 @@ void MainWidget::onStartChat(bool)
 //     } else {
 //         kDebug() << "This should be a success.";
 //     }
-}
\ No newline at end of file
+}

-- 
ktp-contact-list packaging