[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=97dc024

The following commit has been merged in the master branch:
commit 97dc024ed4af3a5ae7eddc705aa3c9a4753e7d6e
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Dec 30 16:04:41 2011 +0100

    Use display name from dialog in SalutEnabler
---
 src/salut-details-dialog.cpp |  2 +-
 src/salut-details-dialog.h   |  2 +-
 src/salut-enabler.cpp        | 61 ++++++++++++++++++++++----------------------
 src/salut-enabler.h          |  2 +-
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/salut-details-dialog.cpp b/src/salut-details-dialog.cpp
index f95826d..8b491bd 100644
--- a/src/salut-details-dialog.cpp
+++ b/src/salut-details-dialog.cpp
@@ -94,7 +94,7 @@ SalutDetailsDialog::~SalutDetailsDialog()
 
 void SalutDetailsDialog::accept()
 {
-    Q_EMIT dialogAccepted(d->widget->parametersSet());
+    Q_EMIT dialogAccepted(d->widget->displayName(), d->widget->parametersSet());
     KDialog::accept();
 }
 
diff --git a/src/salut-details-dialog.h b/src/salut-details-dialog.h
index 804d61b..a0c2e85 100644
--- a/src/salut-details-dialog.h
+++ b/src/salut-details-dialog.h
@@ -40,7 +40,7 @@ public:
 
 Q_SIGNALS:
     void feedbackMessage(const QString &text, const QString &comment, KMessageWidget::MessageType);
-    void dialogAccepted(const QVariantMap &values);
+    void dialogAccepted(const QString &displayName, const QVariantMap &values);
 
 private:
     void accept();
diff --git a/src/salut-enabler.cpp b/src/salut-enabler.cpp
index b16e57f..a45e3da 100644
--- a/src/salut-enabler.cpp
+++ b/src/salut-enabler.cpp
@@ -66,6 +66,7 @@ public:
     SalutDetailsDialog *detailsDialog;
     SalutMessageWidget *messageWidget;
     QWeakPointer<QFrame> salutMessageFrame;
+    QString displayName;
 };
 
 SalutEnabler::SalutEnabler(const Tp::AccountManagerPtr accountManager, QObject *parent)
@@ -184,42 +185,40 @@ void SalutEnabler::onUserAccepted()
         properties.insert(TP_PROP_ACCOUNT_ENABLED, true);
     }
 
-    // FIXME: Ask the user to submit a Display Name
-
-    QString displayName;
-
-    QString lastname = d->values[lastNamePar].toString();
-    QString firstname = d->values[firstNamePar].toString();
-    QString nickname = d->values[nickNamePar].toString();
-
-    if (!firstname.isEmpty()) {
-        displayName = firstname;
-    }
+    if (d->displayName.isEmpty())
+    {
+        QString lastname = d->values[lastNamePar].toString();
+        QString firstname = d->values[firstNamePar].toString();
+        QString nickname = d->values[nickNamePar].toString();
 
-    if (!lastname.isEmpty()) {
-        if (!displayName.isEmpty()) {
-            displayName.append(QString::fromLatin1(" %1").arg(lastname));
-        } else {
-            displayName = lastname;
+        if (!firstname.isEmpty()) {
+            d->displayName = firstname;
         }
-    }
 
-    if (!nickname.isEmpty()) {
-        if (!displayName.isEmpty()) {
-            displayName.append(QString::fromLatin1(" (%1)").arg(nickname));
-        } else {
-            displayName = nickname;
+        if (!lastname.isEmpty()) {
+            if (!d->displayName.isEmpty()) {
+                d->displayName.append(QString::fromLatin1(" %1").arg(lastname));
+            } else {
+                d->displayName = lastname;
+            }
         }
-    }
 
-    if (displayName.isEmpty()) {
-        //FIXME: let the user know that he reached a very strange situation
-        kWarning() << "All fields are empty";
+        if (!nickname.isEmpty()) {
+            if (!d->displayName.isEmpty()) {
+                d->displayName.append(QString::fromLatin1(" (%1)").arg(nickname));
+            } else {
+                d->displayName = nickname;
+            }
+        }
+        if (d->displayName.isEmpty()) {
+            //FIXME: let the user know that he reached a very strange situation
+            kWarning() << "All fields are empty";
+        }
     }
 
     Tp::PendingAccount *pa = d->accountManager->createAccount(d->profile->cmName(),
                                                               d->profile->protocolName(),
-                                                              displayName,
+                                                              d->displayName,
                                                               d->values,
                                                               properties);
 
@@ -265,8 +264,8 @@ void SalutEnabler::onUserWantingChanges()
 {
     d->detailsDialog = new SalutDetailsDialog(d->profileManager, d->connectionManager, 0);
 
-    connect(d->detailsDialog, SIGNAL(dialogAccepted(QVariantMap)),
-            this, SLOT(onDialogAccepted(QVariantMap)));
+    connect(d->detailsDialog, SIGNAL(dialogAccepted(QString,QVariantMap)),
+            this, SLOT(onDialogAccepted(QString,QVariantMap)));
 
     connect(d->detailsDialog, SIGNAL(rejected()),
             this, SLOT(onUserCancelled()));
@@ -277,13 +276,13 @@ void SalutEnabler::onUserWantingChanges()
     d->detailsDialog->exec();
 }
 
-void SalutEnabler::onDialogAccepted(const QVariantMap &values)
+void SalutEnabler::onDialogAccepted(const QString &displayName, const QVariantMap &values)
 {
     kDebug() << values;
+    d->displayName = displayName;
     d->values.insert(firstNamePar, values[firstNamePar].toString());
     d->values.insert(lastNamePar, values[lastNamePar].toString());
     d->values.insert(nickNamePar, values[nickNamePar].toString());
-
     onUserAccepted();
 }
 
diff --git a/src/salut-enabler.h b/src/salut-enabler.h
index 7d4d640..a1cddee 100644
--- a/src/salut-enabler.h
+++ b/src/salut-enabler.h
@@ -52,7 +52,7 @@ public Q_SLOTS:
     void onUserAccepted();
     void onUserWantingChanges();
     void onUserCancelled();
-    void onDialogAccepted(const QVariantMap &values);
+    void onDialogAccepted(const QString &displayName, const QVariantMap &values);
 
 private Q_SLOTS:
     void onAccountCreated(Tp::PendingOperation *op);

-- 
ktp-accounts-kcm packaging