[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=5f1f87c

The following commit has been merged in the master branch:
commit 5f1f87c78aeacf57f804318a2302588861485a84
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Thu Mar 7 01:02:29 2013 +0100

    Delay setting the model until the account manager is set.
    
    This fixes the weird horizontal scrollbar bug appearing when the
    vertical scrollbar appears.
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
    Reviewed by: David Edmundson <kde at davidedmunson.co.uk>
    BUG: 316260
    FIXED-IN: 0.6.0
---
 contact-list-widget.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index c3a8ec4..bd67fb9 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -76,7 +76,6 @@ ContactListWidget::ContactListWidget(QWidget *parent)
     d->model->setDynamicSortFilter(true);
     d->model->setSortRole(Qt::DisplayRole);
 
-    setModel(d->model);
 
     setSortingEnabled(true);
     sortByColumn(0, Qt::AscendingOrder);
@@ -145,6 +144,11 @@ void ContactListWidget::setAccountManager(const Tp::AccountManagerPtr &accountMa
     d->accountManager = accountManager;
     d->model->setAccountManager(accountManager);
 
+    // We set the model only when the account manager is set.
+    // This fixes the weird horizontal scrollbar bug
+    // See https://bugs.kde.org/show_bug.cgi?id=316260
+    setModel(d->model);
+
     QList<Tp::AccountPtr> accounts = accountManager->allAccounts();
 
     if(accounts.count() == 0) {

-- 
ktp-contact-list packaging