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

The following commit has been merged in the master branch:
commit bf294eaef7f8f68b3fcc9fddaf3cfce6f112bedc
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Tue Oct 25 11:58:39 2011 +0200

    Fix creation of duplicate accounts
    
    duplicate accounts can't be created anymore.
    BUG: 277845
    REVIEW: 102962
    Reviewed By: Martin Klapetek
---
 src/add-account-assistant.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 80ed055..b455b83 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -68,8 +68,8 @@ public:
 };
 
 AddAccountAssistant::AddAccountAssistant(Tp::AccountManagerPtr accountManager, QWidget *parent)
- : KAssistantDialog(parent),
-   d(new Private)
+    : KAssistantDialog(parent),
+    d(new Private)
 {
     kDebug();
 
@@ -156,6 +156,15 @@ void AddAccountAssistant::accept()
         return;
     }
 
+    // Check account we're trying to create doesn't already exist
+    foreach (Tp::AccountPtr account, d->accountManager->allAccounts()) {
+        if (values.value("account") == account->displayName()
+            && d->currentProfileItem->protocolName() == account->protocolName()) {
+            KMessageBox::information(this, i18n("Account already exists. Old one will be used instead"));
+            return;
+        }
+    }
+
     // 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;

-- 
ktp-accounts-kcm packaging