[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=272e41b

The following commit has been merged in the master branch:
commit 272e41b24b93b19f69e4e4edc13e2aa021d13e46
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Mar 4 11:43:48 2011 +0100

    Don't show account groups for accounts that are not online, but show them only if the account becomes online
---
 accounts-model.cpp | 2 +-
 accounts-model.h   | 2 +-
 main-widget.cpp    | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/accounts-model.cpp b/accounts-model.cpp
index de1a0f8..3fe4a72 100644
--- a/accounts-model.cpp
+++ b/accounts-model.cpp
@@ -62,7 +62,7 @@ AccountsModel::AccountsModel(const Tp::AccountManagerPtr &am, QObject *parent)
             SLOT(onItemsRemoved(TreeNode*,int,int)));
 
     foreach (Tp::AccountPtr account, mPriv->mAM->allAccounts()) {
-        if(account->isEnabled()) {
+        if(account->isEnabled() && account->connectionStatus() == Tp::ConnectionStatusConnected) {
             AccountsModelItem *item = new AccountsModelItem(account);
             connect(item, SIGNAL(connectionStatusChanged(QString,int)),
                     this, SIGNAL(accountConnectionStatusChanged(QString,int)));
diff --git a/accounts-model.h b/accounts-model.h
index 99d23cd..8c82212 100644
--- a/accounts-model.h
+++ b/accounts-model.h
@@ -112,7 +112,7 @@ Q_SIGNALS:
     void accountCountChanged();
     void accountConnectionStatusChanged(const QString &accountId, int status);
 
-protected Q_SLOTS:
+public Q_SLOTS:
     void onNewAccount(const Tp::AccountPtr &account);
     void onItemChanged(TreeNode *node);
     void onItemsAdded(TreeNode *parent, const QList<TreeNode *> &nodes);
diff --git a/main-widget.cpp b/main-widget.cpp
index 5a395ba..ab04567 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -225,6 +225,8 @@ void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
         break;
     case Tp::ConnectionStatusConnected:
         showMessageToUser(i18n("Connected!"), MainWidget::SystemMessageInfo);
+        m_model->onNewAccount(Tp::AccountPtr(dynamic_cast<Tp::Account*>(sender())));
+        m_contactsListView->expandAll();
         break;
     case Tp::ConnectionStatusDisconnected:
         showMessageToUser(i18n("Disconnected!"), MainWidget::SystemMessageInfo);

-- 
ktp-contact-list packaging