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

The following commit has been merged in the master branch:
commit e9e313b408ae4412c38e7743e158a5e35eaa5918
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Feb 21 21:45:00 2011 +0000

    Make sure a display name is set when adding an account.
    Sovles a bug where a user cannot add a local-xmpp account.
---
 src/add-account-assistant.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index eb9a644..623892f 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -161,9 +161,18 @@ void AddAccountAssistant::accept()
     properties.insert("org.freedesktop.Telepathy.Account.Enabled", true);
 
     // FIXME: Ask the user to submit a Display Name
+
+    QString displayName;
+    if (values.contains("account")) {
+        displayName = values["account"].toString();
+    }
+    else {
+        displayName = d->currentProfileItem->protocolName();
+    }
+
     Tp::PendingAccount *pa = d->accountManager->createAccount(d->currentProfileItem->cmName(),
                                                               d->currentProfileItem->protocolName(),
-                                                              values["account"].toString(),
+                                                              displayName,
                                                               values,
                                                               properties);
 

-- 
ktp-accounts-kcm packaging