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

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

    Use display name in EditAccountDialog
---
 src/edit-account-dialog.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 8b9ae32..bcfc91b 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -98,12 +98,14 @@ void EditAccountDialog::onWalletOpened(Tp::PendingOperation *op)
         parameterModel->setData(index, password, Qt::EditRole);
     }
 
-
     // Set up the interface
     d->widget = new AccountEditWidget(d->account->profile(),
                                       parameterModel,
                                       doNotConnectOnAdd,
                                       this);
+
+    d->widget->setDisplayName(d->account->displayName());
+
     setMainWidget(d->widget);
 
     d->kwalletReady = true;
@@ -168,17 +170,7 @@ void EditAccountDialog::onParametersUpdated(Tp::PendingOperation *op)
         KTp::WalletUtils::setAccountPassword(d->account, QString());
     }
 
-
-    // FIXME: Ask the user to submit a Display Name
-    QString displayName;
-    if (values.contains(QLatin1String("account"))) {
-        displayName = values[QLatin1String("account")].toString();
-    }
-    else {
-        displayName = d->account->profile()->protocolName();
-    }
-
-    Tp::PendingOperation *dnop = d->account->setDisplayName(displayName);
+    Tp::PendingOperation *dnop = d->account->setDisplayName(d->widget->displayName());
 
     connect(dnop,
             SIGNAL(finished(Tp::PendingOperation*)),

-- 
ktp-accounts-kcm packaging