SVN commit 1168777 by davidedmundson: 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. M +1 -0 accounts-list-model.cpp M +4 -2 kcm-telepathy-accounts.cpp --- trunk/playground/network/telepathy-accounts-kcm/src/accounts-list-model.cpp #1168776:1168777 @@ -156,6 +156,7 @@ return; } + accountItem->disconnect(); connect(accountItem, SIGNAL(protocolSelected(QString, QString)), this, SIGNAL(protocolSelected(QString, QString))); connect(this, SIGNAL(setTitleForCustomPages(QString, QList)), --- trunk/playground/network/telepathy-accounts-kcm/src/kcm-telepathy-accounts.cpp #1168776:1168777 @@ -78,6 +78,9 @@ connect(m_accountsListView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), SLOT(onSelectedItemChanged())); + connect(this, SIGNAL(setTitleForCustomPages(QString, QList)), + m_accountsListModel, SLOT(onTitleForCustomPages(QString, QList))); + } KCMTelepathyAccounts::~KCMTelepathyAccounts() @@ -186,8 +189,7 @@ m_accountsListModel->disconnect(); connect(m_accountsListModel, SIGNAL(protocolSelected(QString, QString)), this, SLOT(onProtocolSelected(QString, QString))); - connect(this, SIGNAL(setTitleForCustomPages(QString, QList)), - m_accountsListModel, SLOT(onTitleForCustomPages(QString, QList))); + m_accountsListModel->editAccount(index); }