[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=7e80e0c

The following commit has been merged in the master branch:
commit 7e80e0ca4334bc90d00943797849155352257cb2
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Wed Dec 28 18:08:55 2011 +0100

    Update to use aysnc setting of account manager in account model creation.
---
 mainwindow.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0d654d6..e7c8c7d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -159,6 +159,19 @@ MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
                                                   channelFactory,
                                                   contactFactory);
 
+    m_accountsModel = new AccountsModel(this);
+    AccountsFilterModel *filterModel = new AccountsFilterModel(this);
+    filterModel->setSourceModel(m_accountsModel);
+    filterModel->setShowOfflineUsers(false);
+    filterModel->setFilterByFileTransferCapability(true);
+
+    connect(ui->filterBar, SIGNAL(textChanged(QString)),
+            filterModel, SLOT(setFilterString(QString)));
+
+    FlatModelProxy *flatProxyModel = new FlatModelProxy(filterModel);
+
+    ui->listView->setModel(flatProxyModel);
+    ui->listView->setItemDelegate(new ContactGridDelegate(this));
 
     connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAccountManagerReady()));
 
@@ -173,19 +186,7 @@ MainWindow::~MainWindow()
 
 void MainWindow::onAccountManagerReady()
 {
-    m_accountsModel = new AccountsModel(m_accountManager, this);
-    AccountsFilterModel *filterModel = new AccountsFilterModel(this);
-    filterModel->setSourceModel(m_accountsModel);
-    filterModel->setShowOfflineUsers(false);
-    filterModel->setFilterByFileTransferCapability(true);
-
-    connect(ui->filterBar, SIGNAL(textChanged(QString)),
-            filterModel, SLOT(setFilterString(QString)));
-
-    FlatModelProxy *flatProxyModel = new FlatModelProxy(filterModel);
-
-    ui->listView->setModel(flatProxyModel);
-    ui->listView->setItemDelegate(new ContactGridDelegate(this));
+    m_accountsModel->setAccountManager(m_accountManager);
 }
 
 void MainWindow::onDialogAccepted()

-- 
ktp-send-file packaging