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

The following commit has been merged in the master branch:
commit a5fab334f7a53e6517f990008af748dc7dbf4a92
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 23 19:15:03 2012 +0100

    Use display name in AddAccountAssistant
---
 src/add-account-assistant.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 07eae58..f8eacb1 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -217,16 +217,6 @@ void AddAccountAssistant::accept()
       properties.insert(QLatin1String("org.freedesktop.Telepathy.Account.Enabled"), true);
     }
 
-    // FIXME: Ask the user to submit a Display Name
-
-    QString displayName;
-    if (values.contains(QLatin1String("account"))) {
-        displayName = values[QLatin1String("account")].toString();
-    }
-    else {
-        displayName = d->currentProfileItem->protocolName();
-    }
-
     //remove password values from being sent. These are stored by KWallet instead
 
     //FIXME: This is a hack for jabber registration, we don't remove passwords - see Telepathy ML thread "Storing passwords in MC and regsitering new accounts"
@@ -237,7 +227,7 @@ void AddAccountAssistant::accept()
 
     Tp::PendingAccount *pa = d->accountManager->createAccount(d->currentProfileItem->cmName(),
                                                               d->currentProfileItem->protocolName(),
-                                                              displayName,
+                                                              d->accountEditWidget->displayName(),
                                                               values,
                                                               properties);
 

-- 
ktp-accounts-kcm packaging