[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=574fa52

The following commit has been merged in the master branch:
commit 574fa52ba3d8f07c22979cb206c2b6a3bc658eef
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Aug 27 11:22:09 2010 +0000

    Make sure we only connect to the account item onTitleUpdated slot once.
    
    This fixes a bug in which editing a jabber account, then editing it again will result in 4 sets of tabs the second time.
    
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1168777
---
 src/accounts-list-model.cpp    | 1 +
 src/kcm-telepathy-accounts.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/accounts-list-model.cpp b/src/accounts-list-model.cpp
index 0f607f2..165fb27 100644
--- a/src/accounts-list-model.cpp
+++ b/src/accounts-list-model.cpp
@@ -156,6 +156,7 @@ void AccountsListModel::editAccount(const QModelIndex &index)
         return;
     }
 
+      accountItem->disconnect();
 	connect(accountItem, SIGNAL(protocolSelected(QString, QString)),
 		this, SIGNAL(protocolSelected(QString, QString)));
 	connect(this, SIGNAL(setTitleForCustomPages(QString, QList<QString>)),
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index a8ebd93..353f840 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -78,6 +78,9 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
     connect(m_accountsListView->selectionModel(),
             SIGNAL(currentChanged(QModelIndex, QModelIndex)),
             SLOT(onSelectedItemChanged()));
+      connect(this, SIGNAL(setTitleForCustomPages(QString, QList<QString>)),
+                  m_accountsListModel, SLOT(onTitleForCustomPages(QString, QList<QString>)));
+
 }
 
 KCMTelepathyAccounts::~KCMTelepathyAccounts()
@@ -186,8 +189,7 @@ void KCMTelepathyAccounts::onEditAccountClicked()
 	m_accountsListModel->disconnect();
 	connect(m_accountsListModel, SIGNAL(protocolSelected(QString, QString)),
 			this, SLOT(onProtocolSelected(QString, QString)));
-	connect(this, SIGNAL(setTitleForCustomPages(QString, QList<QString>)),
-			m_accountsListModel, SLOT(onTitleForCustomPages(QString, QList<QString>)));
+      
     m_accountsListModel->editAccount(index);
 }
 

-- 
ktp-accounts-kcm packaging