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

The following commit has been merged in the master branch:
commit a62dc83d6600aa3b5ab9c0ea4af167fc09172647
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Sep 15 15:47:52 2011 +0100

    Check for Accounts KCM before trying to open it
    
    Reviewed-by: Mr. Edmundson
    CCBUG: 280304
---
 main-widget.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/main-widget.cpp b/main-widget.cpp
index 597d8e0..ca13d12 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -55,6 +55,7 @@
 #include <KStandardShortcut>
 #include <KNotification>
 #include <KToolInvocation>
+#include <kservice.h>
 
 #include "ui_main-widget.h"
 #include "account-buttons-panel.h"
@@ -1165,6 +1166,14 @@ void MainWidget::showSettingsKCM()
 {
     KSettings::Dialog *dialog = new KSettings::Dialog(this);
 
+    KService::Ptr tpAccKcm = KService::serviceByDesktopName("kcm_telepathy_accounts");
+
+    if (!tpAccKcm) {
+        KMessageBox::error(this,
+                           i18n("It appears you don't have the IM Accounts control module installed. Please install telepathy-accounts-kcm package."),
+                           i18n("IM Accounts KCM Plugin Is Not Installed"));
+    }
+
     dialog->addModule("kcm_telepathy_accounts");
 
     dialog->setAttribute(Qt::WA_DeleteOnClose);

-- 
ktp-contact-list packaging