From 09e5289038e719443541ccbd49aadf20b94a59a7 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Tue, 26 Jun 2012 11:31:34 -0400
Subject: [PATCH] [ #12352 ] Fix deleting account
---
kde/src/CallView.cpp | 2 +-
kde/src/conf/dlgaccounts.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp
index 55c8de49d1..d6c956394b 100644
--- a/kde/src/CallView.cpp
+++ b/kde/src/CallView.cpp
@@ -275,7 +275,7 @@ bool CallView::phoneNumberToCall(QTreeWidgetItem *parent, int index, const QMime
Q_UNUSED(action)
QByteArray encodedPhoneNumber = data->data( MIME_PHONENUMBER );
if (!QString(encodedPhoneNumber).isEmpty()) {
- Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(encodedPhoneNumber);
+ Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(encodedPhoneNumber,true);
QString name;
name = (contact)?contact->getFormattedName():i18n("Unknown");
Call* call2 = SFLPhone::model()->addDialingCall(name, AccountList::getCurrentAccount());
diff --git a/kde/src/conf/dlgaccounts.cpp b/kde/src/conf/dlgaccounts.cpp
index b94a89b622..55ed8e5944 100755
--- a/kde/src/conf/dlgaccounts.cpp
+++ b/kde/src/conf/dlgaccounts.cpp
@@ -586,6 +586,7 @@ void DlgAccounts::on_button_accountRemove_clicked()
{
kDebug() << "on_button_accountRemove_clicked";
AccountList::getInstance()->removeAccount(listView_accountList->currentIndex());
+ listView_accountList->setCurrentIndex(listView_accountList->model()->index(0,0));
}
void DlgAccounts::on_edit1_alias_textChanged(const QString & text)
@@ -636,6 +637,7 @@ void DlgAccounts::updateAccountStates()
void DlgAccounts::updateStatusLabel(QModelIndex item)
{
+ kDebug() << "MODEL index is" << item.row();
if(!item.isValid()) {
return;
}
--
GitLab