[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=9a3f65c

The following commit has been merged in the master branch:
commit 9a3f65cbf79f67967004aa33763277be16305c99
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jul 16 15:18:49 2012 +0200

    Remove useless (and broken) slot
    
    It was used only for expanding the account/group tree items, but this is handled differently for some time now, so this becomes obsolete.
---
 contact-list-widget.cpp | 27 ---------------------------
 contact-list-widget.h   |  1 -
 2 files changed, 28 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 09a9c4b..3809c24 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -136,11 +136,6 @@ void ContactListWidget::setAccountManager(const Tp::AccountManagerPtr &accountMa
     Q_D(ContactListWidget);
     d->model->setAccountManager(accountManager);
 
-    connect(accountManager.data(), SIGNAL(newAccount(Tp::AccountPtr)),
-                this, SLOT(onNewAccountAdded(Tp::AccountPtr)));
-
-
-
     QList<Tp::AccountPtr> accounts = accountManager->allAccounts();
 
     if(accounts.count() == 0) {
@@ -151,10 +146,6 @@ void ContactListWidget::setAccountManager(const Tp::AccountManagerPtr &accountMa
             showSettingsKCM();
         }
     }
-
-    foreach (const Tp::AccountPtr &account, accounts) {
-        onNewAccountAdded(account);
-    }
 }
 
 AccountsModel* ContactListWidget::accountsModel()
@@ -183,24 +174,6 @@ void ContactListWidget::showSettingsKCM()
     dialog->exec();
 }
 
-void ContactListWidget::onNewAccountAdded(const Tp::AccountPtr& account)
-{
-    Q_ASSERT(account->isReady(Tp::Account::FeatureCore));
-
-    connect(account.data(),
-            SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)),
-            this, SLOT(onAccountConnectionStatusChanged(Tp::ConnectionStatus)));
-
-    //FIXME get rid of that thing already
-//     m_avatarButton->loadAvatar(account);
-//     KSharedConfigPtr config = KGlobal::config();
-//     KConfigGroup avatarGroup(config, "Avatar");
-//     if (avatarGroup.readEntry("method", QString()) == QLatin1String("account")) {
-//         //this also updates the avatar if it was changed somewhere else
-//         m_avatarButton->selectAvatarFromAccount(avatarGroup.readEntry("source", QString()));
-//     }
-}
-
 void ContactListWidget::onContactListClicked(const QModelIndex& index)
 {
     if (!index.isValid()) {
diff --git a/contact-list-widget.h b/contact-list-widget.h
index 3e3b071..fd933df 100644
--- a/contact-list-widget.h
+++ b/contact-list-widget.h
@@ -62,7 +62,6 @@ public Q_SLOTS:
     void onShowBlockedContacts();
 
 private Q_SLOTS:
-    void onNewAccountAdded(const Tp::AccountPtr &account);
     void onContactListClicked(const QModelIndex &index);
     void onContactListDoubleClicked(const QModelIndex &index);
 

-- 
ktp-contact-list packaging