[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=f1cd75d

The following commit has been merged in the master branch:
commit f1cd75d88bf2a7379637400ed6b7d3e6136944d8
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Sep 18 19:21:42 2011 +0100

    Hide salutListView when the local-xmpp account is not configured
---
 src/kcm-telepathy-accounts.cpp | 15 +++++++++++++++
 src/kcm-telepathy-accounts.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index f315f60..7e5192a 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -86,6 +86,7 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
     // Set up the UI stuff.
     m_ui = new Ui::MainWidget;
     m_ui->setupUi(this);
+    m_ui->salutListView->setHidden(true);
 
     m_accountsListModel = new AccountsListModel(this);
 
@@ -142,6 +143,12 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
     connect(m_ui->salutListView->selectionModel(),
             SIGNAL(currentChanged(QModelIndex, QModelIndex)),
             SLOT(onSelectedItemChanged(QModelIndex, QModelIndex)));
+    connect(m_accountsListModel,
+            SIGNAL(rowsInserted(QModelIndex, int, int)),
+            SLOT(onModelDataChanged()));
+    connect(m_accountsListModel,
+            SIGNAL(rowsRemoved(QModelIndex, int, int)),
+            SLOT(onModelDataChanged()));
 }
 
 KCMTelepathyAccounts::~KCMTelepathyAccounts()
@@ -199,6 +206,8 @@ void KCMTelepathyAccounts::onAccountManagerReady(Tp::PendingOperation *op)
         m_accountsListModel->addAccount(account);
     }
 
+    onModelDataChanged();
+
     connect(m_accountManager.data(),
             SIGNAL(newAccount (Tp::AccountPtr)),
             SLOT(onAccountCreated(Tp::AccountPtr)));
@@ -283,6 +292,12 @@ void KCMTelepathyAccounts::onRemoveAccountClicked()
     }
 }
 
+void KCMTelepathyAccounts::onModelDataChanged()
+{
+    bool salutEnabled = m_salutFilterModel->rowCount() == 0;
+    m_ui->salutListView->setHidden(salutEnabled);
+}
+
 /////
 
 ErrorOverlay::ErrorOverlay(QWidget *baseWidget, const QString &details, QWidget *parent) :
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index a755c7a..b16589f 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -63,6 +63,7 @@ private Q_SLOTS:
     void onAddAccountClicked();
     void onEditAccountClicked();
     void onRemoveAccountClicked();
+    void onModelDataChanged();
 
 private:
     Ui::MainWidget *m_ui;

-- 
ktp-accounts-kcm packaging