[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=b4ec627

The following commit has been merged in the master branch:
commit b4ec627f1e61012db3a618c8fd919385d94952d8
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Jun 9 13:03:42 2011 +0200

    Fix a crash when the config contains invalid account ID for setting avatar.
    
    Reviewed-by: David Edmundson
    BUG: 271882
---
 main-widget.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 3404572..37fee73 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -333,7 +333,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
         KDialog *dialog = new KDialog(this);
         dialog->setCaption(i18n("No Accounts Found"));
         dialog->setButtons(KDialog::Ok | KDialog::Cancel);
-        dialog->setMainWidget(new QLabel(i18n("No Accounts Found")));
+        dialog->setMainWidget(new QLabel(i18n("You have no IM accounts configured. Would you like to do that now?")));
         dialog->setButtonText(KDialog::Ok, i18n("Configure Accounts"));
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->setInitialSize(dialog->sizeHint());
@@ -1023,6 +1023,18 @@ void MainWidget::selectAvatarFromAccount(const QString &accountUID)
         return;
     }
 
+    if (m_model->accountItemForId(accountUID) == 0) {
+        kDebug() << "Chosen account ID does not exist, aborting..";
+
+        //no point of keeping the config if the previously set account ID does not exist
+        KSharedConfigPtr config = KGlobal::config();
+        KConfigGroup avatarGroup(config, "Avatar");
+        avatarGroup.deleteGroup();
+        avatarGroup.config()->sync();
+
+        return;
+    }
+
     Tp::Avatar avatar = qobject_cast<AccountsModelItem*>(m_model->accountItemForId(accountUID))->data(AccountsModel::AvatarRole).value<Tp::Avatar>();
 
     foreach (const Tp::AccountPtr account, m_accountManager->allAccounts()) {

-- 
ktp-contact-list packaging