[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=326d2d1

The following commit has been merged in the master branch:
commit 326d2d1dd3e246f238878017626c184da731c971
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Sep 12 19:34:17 2011 +0200

    Don't initialize models if AccountManager failed to become ready.
    
    Reviewed-by: David Edmundson
---
 main-widget.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/main-widget.cpp b/main-widget.cpp
index a4f27a8..0f9142a 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -287,6 +287,13 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     if (op->isError()) {
         kDebug() << op->errorName();
         kDebug() << op->errorMessage();
+
+        KMessageBox::error(this,
+                           i18n("Something unexpected happened to the core part of your Instant Messaging system "
+                                "and it couldn't be initialized. Try restarting the Contact List."),
+                           i18n("IM system failed to initialize"));
+
+        return;
     }
 
     m_model = new AccountsModel(m_accountManager, this);

-- 
ktp-contact-list packaging