[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=48a7bc6

The following commit has been merged in the master branch:
commit 48a7bc656e5f1dbee2d7a5ca3818af24afcb1185
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Jun 13 01:02:10 2012 +0200

    Fix groups collapsing and expanding
    
    Reviewed-by: David Edmundson
    
    BUG: 301719
    FIXED-IN: 0.4.1
---
 contact-list-widget.cpp | 23 -----------------------
 contact-list-widget.h   |  1 -
 2 files changed, 24 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 2fc02de..30c84ba 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -149,9 +149,6 @@ void ContactListWidget::setAccountManager(const Tp::AccountManagerPtr &accountMa
     foreach (const Tp::AccountPtr &account, accounts) {
         onNewAccountAdded(account);
     }
-
-    expandAll();
-
 }
 
 AccountsModel* ContactListWidget::accountsModel()
@@ -180,26 +177,6 @@ void ContactListWidget::showSettingsKCM()
     dialog->exec();
 }
 
-void ContactListWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
-{
-    Q_D(ContactListWidget);
-
-    kDebug() << "Connection status is" << status;
-
-    Tp::AccountPtr account(qobject_cast< Tp::Account* >(sender()));
-    QModelIndex index = d->model->index(qobject_cast<AccountsModelItem*>(d->model->accountItemForId(account->uniqueIdentifier())));
-
-    switch (status) {
-        case Tp::ConnectionStatusConnected:
-            setExpanded(index, true);
-            break;
-        case Tp::ConnectionStatusConnecting:
-            setExpanded(index, false);
-        default:
-            break;
-    }
-}
-
 void ContactListWidget::onNewAccountAdded(const Tp::AccountPtr& account)
 {
     Q_ASSERT(account->isReady(Tp::Account::FeatureCore));
diff --git a/contact-list-widget.h b/contact-list-widget.h
index 0a66178..911c0f2 100644
--- a/contact-list-widget.h
+++ b/contact-list-widget.h
@@ -64,7 +64,6 @@ private Q_SLOTS:
     void onNewAccountAdded(const Tp::AccountPtr &account);
     void onContactListClicked(const QModelIndex &index);
     void onContactListDoubleClicked(const QModelIndex &index);
-    void onAccountConnectionStatusChanged(Tp::ConnectionStatus status);
 
     void onNewGroupModelItemsInserted(const QModelIndex &index, int start, int end);
     void addOverlayButtons();

-- 
ktp-contact-list packaging