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

The following commit has been merged in the master branch:
commit dd1aa06bd6c72920f2830742d59ce352529b07a3
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sun Mar 17 17:13:46 2013 +0100

    Replace tabs with space indentation
---
 src/kcm-telepathy-accounts.cpp | 57 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 7080410..f5f5a67 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -104,8 +104,8 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
             SIGNAL(finished(Tp::PendingOperation*)),
             SLOT(onAccountManagerReady(Tp::PendingOperation*)));
     connect(m_accountManager.constData(),
-	    SIGNAL(newAccount(Tp::AccountPtr)),
-	    SLOT(onNewAccountAdded(Tp::AccountPtr)));
+            SIGNAL(newAccount(Tp::AccountPtr)),
+            SLOT(onNewAccountAdded(Tp::AccountPtr)));
 
     // Set up the UI stuff.
     m_ui = new Ui::MainWidget;
@@ -255,19 +255,18 @@ void KCMTelepathyAccounts::onNewAccountAdded(const Tp::AccountPtr& account)
 {
     KTp::LogsImporter logsImporter;
     if (!logsImporter.hasKopeteLogs(account)) {
-	kDebug() << "No Kopete logs for" << account->uniqueIdentifier() << "found";
-	return;
+        kDebug() << "No Kopete logs for" << account->uniqueIdentifier() << "found";
+        return;
     }
 
     int ret = KMessageBox::questionYesNo(this,
-		i18n("We have found Kopete logs for this account. Do you want to import the logs to KDE Telepathy?"),
-		i18n("Import Logs?"),
-		KGuiItem(i18n("Import Logs"), QLatin1String("document-import")),
-		KGuiItem(i18n("Close"), QLatin1String("dialog-close")));
-				;
+                i18n("We have found Kopete logs for this account. Do you want to import the logs to KDE Telepathy?"),
+                i18n("Import Logs?"),
+                KGuiItem(i18n("Import Logs"), QLatin1String("document-import")),
+                KGuiItem(i18n("Close"), QLatin1String("dialog-close")));
 
     if (ret == KMessageBox::No) {
-	return;
+        return;
     }
 
     m_importProgressDialog = new KProgressDialog(this);
@@ -290,7 +289,7 @@ void KCMTelepathyAccounts::onNewAccountAdded(const Tp::AccountPtr& account)
 void KCMTelepathyAccounts::onLogsImportError(const QString &error)
 {
     if (m_importProgressDialog) {
-	m_importProgressDialog->close();
+        m_importProgressDialog->close();
     }
 
     KMessageBox::error(this, error, i18n("Kopete Logs Import"));
@@ -299,7 +298,7 @@ void KCMTelepathyAccounts::onLogsImportError(const QString &error)
 void KCMTelepathyAccounts::onLogsImportDone()
 {
     if (m_importProgressDialog) {
-	m_importProgressDialog->close();
+        m_importProgressDialog->close();
     }
 
     KMessageBox::information(this, i18n("Kopete logs successfully imported"), i18n("Kopete Logs Import"));
@@ -407,23 +406,23 @@ void KCMTelepathyAccounts::onRemoveAccountClicked()
     dialog->setButtonGuiItem(KDialog::Yes, KGuiItem(i18n("Remove Account"), QLatin1String("edit-delete")));
     bool removeLogs = false;
     if (KMessageBox::createKMessageBox(dialog, QMessageBox::Warning, i18n("Are you sure you want to remove the account \"%1\"?", accountName),
-			QStringList(),  i18n("Remove conversations logs"), &removeLogs,
-			KMessageBox::Dangerous | KMessageBox::Notify) == KDialog::Yes) {
-
-	Tp::AccountPtr account = index.data(KTp::AccountsListModel::AccountRole).value<Tp::AccountPtr>();
-	if (account.isNull()) {
-	    return;
-	}
-
-	if (removeLogs) {
-	    Tpl::LogManagerPtr logManager = Tpl::LogManager::instance();
-	    logManager->clearAccountHistory(account);
-	}
-
-         QList<Tp::PendingOperation*> ops;
-         ops.append(KTp::WalletUtils::removeAccountPassword(account));
-         ops.append(account->remove());
-         connect(new Tp::PendingComposite(ops, account), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onOperationFinished(Tp::PendingOperation*)));
+                QStringList(),  i18n("Remove conversations logs"), &removeLogs,
+                KMessageBox::Dangerous | KMessageBox::Notify) == KDialog::Yes) {
+
+        Tp::AccountPtr account = index.data(KTp::AccountsListModel::AccountRole).value<Tp::AccountPtr>();
+        if (account.isNull()) {
+            return;
+        }
+
+        if (removeLogs) {
+            Tpl::LogManagerPtr logManager = Tpl::LogManager::instance();
+            logManager->clearAccountHistory(account);
+        }
+
+        QList<Tp::PendingOperation*> ops;
+        ops.append(KTp::WalletUtils::removeAccountPassword(account));
+        ops.append(account->remove());
+        connect(new Tp::PendingComposite(ops, account), SIGNAL(finished(Tp::PendingOperation*)), SLOT(onOperationFinished(Tp::PendingOperation*)));
     }
 }
 

-- 
ktp-accounts-kcm packaging