From 574fdd416b5f6b0907826034916c03dddb08341a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sun, 31 May 2015 06:47:55 +0200 Subject: [PATCH 3/5] Whitespace fixup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan BrĂ¼ns --- src/runtime/kwalletd/migrationagent.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp index 110a5e0..ec60812 100644 --- a/src/runtime/kwalletd/migrationagent.cpp +++ b/src/runtime/kwalletd/migrationagent.cpp @@ -59,21 +59,19 @@ void MigrationAgent::migrateWallets() // if the migration wizard returns without error // create "alreadyMigrated=true" setting qDebug() << "Migration agent starting..."; - { - if (connectOldDaemon()) { - if (!isEmptyOldWallet()) { - if (isMigrationWizardOk()) { - setAlreadyMigrated(); - } else { - qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start"; - } - } else { - qDebug() << "Old wallet is empty. No need to migrate."; + if (connectOldDaemon()) { + if (!isEmptyOldWallet()) { + if (isMigrationWizardOk()) { setAlreadyMigrated(); + } else { + qDebug() << "Migration wizard returned an error or has been canceled. The migration agent will resume upon next daemon start"; } } else { - qDebug() << "KDE4 kwalletd not present, stopping migration agent"; + qDebug() << "Old wallet is empty. No need to migrate."; + setAlreadyMigrated(); } + } else { + qDebug() << "KDE4 kwalletd not present, stopping migration agent"; } qDebug() << "Migration agent stop."; } -- 2.12.0