[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=6ef4498

The following commit has been merged in the master branch:
commit 6ef449827a9f9c9dc3c4c1fb0b601a273fdd7a30
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Aug 22 14:44:46 2013 +0200

    Don't stop logs import on error
    
    Documentation to KTp::LogsImporter clearly states that when error() signal,
    the import can still continue importing further logs, so we should not
    quit in onError() slot.
    
    REVIEW: 112189
    BUG: 323821
    FIXED-IN: 0.6.4
---
 src/kcm-telepathy-accounts.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index bc7e973..e8df1bd 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -257,8 +257,8 @@ void KCMTelepathyAccounts::onAccountManagerReady(Tp::PendingOperation *op)
 
 void KCMTelepathyAccounts::onNewAccountAdded(const Tp::AccountPtr& account)
 {
-    KTp::LogsImporter logsImporter;
-    if (!logsImporter.hasKopeteLogs(account)) {
+    QScopedPointer<KTp::LogsImporter> logsImporter(new KTp::LogsImporter(this));
+    if (!logsImporter->hasKopeteLogs(account)) {
         kDebug() << "No Kopete logs for" << account->uniqueIdentifier() << "found";
         return;
     }
@@ -281,10 +281,10 @@ void KCMTelepathyAccounts::onNewAccountAdded(const Tp::AccountPtr& account)
     m_importProgressDialog->setButtons(KDialog::Close);
     m_importProgressDialog->enableButton(KDialog::Close, false);
 
-    connect(&logsImporter, SIGNAL(logsImported()), SLOT(onLogsImportDone()));
-    connect(&logsImporter, SIGNAL(error(QString)), SLOT(onLogsImportError(QString)));
+    connect(logsImporter.data(), SIGNAL(logsImported()), SLOT(onLogsImportDone()));
+    connect(logsImporter.data(), SIGNAL(error(QString)), SLOT(onLogsImportError(QString)));
 
-    logsImporter.startLogImport(account);
+    logsImporter->startLogImport(account);
     m_importProgressDialog->exec();
 
     delete m_importProgressDialog;
@@ -292,10 +292,6 @@ void KCMTelepathyAccounts::onNewAccountAdded(const Tp::AccountPtr& account)
 
 void KCMTelepathyAccounts::onLogsImportError(const QString &error)
 {
-    if (m_importProgressDialog) {
-        m_importProgressDialog->close();
-    }
-
     KMessageBox::error(this, error, i18n("Kopete Logs Import"));
 }
 

-- 
ktp-accounts-kcm packaging