[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9168c15

The following commit has been merged in the master branch:
commit 9168c1560d3e174b1da3b3c6bd0aa29332a96254
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 28 22:04:14 2011 +0100

    Check account properties exist before setting them
---
 src/add-account-assistant.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 623892f..e038e8b 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -156,9 +156,13 @@ void AddAccountAssistant::accept()
     // FIXME: In some next version of tp-qt4 there should be a convenience class for this
     // https://bugs.freedesktop.org/show_bug.cgi?id=33153
     QVariantMap properties;
-
-    properties.insert("org.freedesktop.Telepathy.Account.Service", d->currentProfileItem->serviceName());
-    properties.insert("org.freedesktop.Telepathy.Account.Enabled", true);
+    
+    if (d->accountManager->supportedAccountProperties().contains(QLatin1String("org.freedesktop.Telepathy.Account.Service"))) {
+      properties.insert("org.freedesktop.Telepathy.Account.Service", d->currentProfileItem->serviceName());
+    }
+    if (d->accountManager->supportedAccountProperties().contains(QLatin1String("org.freedesktop.Telepathy.Account.Enabled"))) {
+      properties.insert("org.freedesktop.Telepathy.Account.Enabled", true);
+    }
 
     // FIXME: Ask the user to submit a Display Name
 

-- 
ktp-accounts-kcm packaging