From 10989d13e41a30c7fd278e0f66103f3d8af96a38 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 26 Sep 2014 12:43:54 +0200
Subject: [PATCH] Folder: Remove slotTerminateAndPauseSync

This make no sens to just set the pause config flag here. It make selective sync to mark
the folder as posed on restart
---
 src/mirall/accountsettings.cpp     | 4 ++--
 src/mirall/folder.cpp              | 6 ------
 src/mirall/folder.h                | 1 -
 src/mirall/selectivesyncdialog.cpp | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index c25d891e3..fc0c56ae9 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -383,7 +383,7 @@ void AccountSettings::slotResetCurrentFolder()
         if( ret == QMessageBox::Yes ) {
             FolderMan *folderMan = FolderMan::instance();
             Folder *f = folderMan->folder(alias);
-            f->slotTerminateAndPauseSync();
+            f->slotTerminateSync();
             f->wipe();
             folderMan->slotScheduleAllFolders();
         }
@@ -499,7 +499,7 @@ void AccountSettings::slotEnableCurrentFolder()
         // message box can return at any time while the thread keeps running,
         // so better check again after the user has responded.
         if ( f->isBusy() && terminate ) {
-            f->slotTerminateAndPauseSync();
+            f->slotTerminateSync();
         }
         f->setSyncPaused(!currentlyPaused); // toggle the pause setting
         folderMan->slotSetFolderPaused( alias, !currentlyPaused );
diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 56776a478..4efd2d5e0 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -515,12 +515,6 @@ void Folder::slotTerminateSync()
     }
 }
 
-void Folder::slotTerminateAndPauseSync()
-{
-    slotTerminateSync();
-    FolderMan::instance()->slotSetFolderPaused(alias(), true);
-}
-
 // This removes the csync File database
 // This is needed to provide a clean startup again in case another
 // local folder is synced to the same ownCloud.
diff --git a/src/mirall/folder.h b/src/mirall/folder.h
index b1f4638d6..99988e7ee 100644
--- a/src/mirall/folder.h
+++ b/src/mirall/folder.h
@@ -138,7 +138,6 @@ public slots:
        * terminate the current sync run
        */
      void slotTerminateSync();
-     void slotTerminateAndPauseSync();
 
      void slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool*);
 
diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp
index 92398bc01..9a0ec407a 100644
--- a/src/mirall/selectivesyncdialog.cpp
+++ b/src/mirall/selectivesyncdialog.cpp
@@ -284,7 +284,7 @@ void SelectiveSyncDialog::accept()
 
         FolderMan *folderMan = FolderMan::instance();
         if (_folder->isBusy()) {
-            _folder->slotTerminateAndPauseSync();
+            _folder->slotTerminateSync();
         }
         folderMan->slotScheduleSync(_folder->alias());
     }