From 25e27f220b7cb42a8b1a58d6f716da2665633c04 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 12 Sep 2013 13:35:11 +0200 Subject: [PATCH] When we renamed folder and there is existing folder restore previous name (as folder was not renamed don't change it) --- searchdialog/searchwindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/searchdialog/searchwindow.cpp b/searchdialog/searchwindow.cpp index df76455c0..33eabcb8f 100644 --- a/searchdialog/searchwindow.cpp +++ b/searchdialog/searchwindow.cpp @@ -555,9 +555,11 @@ void SearchWindow::renameSearchFolder() { const QString name = mUi.mSearchFolderEdt->text(); if ( mFolder.isValid() ) { - if ( mFolder.name() != name ) { + const QString oldFolderName = mFolder.name(); + if ( oldFolderName != name ) { mFolder.setName( name ); Akonadi::CollectionModifyJob *job = new Akonadi::CollectionModifyJob( mFolder, this ); + job->setProperty("oldfoldername", oldFolderName); connect( job, SIGNAL(result(KJob*)), this, SLOT(slotSearchFolderRenameDone(KJob*)) ); } @@ -573,6 +575,9 @@ void SearchWindow::slotSearchFolderRenameDone( KJob *job ) KMessageBox::information( this, i18n( "There was a problem renaming your search folder. " "A common reason for this is that another search folder " "with the same name already exists." ) ); + mUi.mSearchFolderEdt->blockSignals(true); + mUi.mSearchFolderEdt->setText(job->property("oldfoldername").toString()); + mUi.mSearchFolderEdt->blockSignals(false); } }