Bugfixes for sync journal name generation and usage

* Use 'user' value for journal name generation
* Save journal name in settings
* Make owncloudcmd choose the right db

1 files changed, 2 insertions, 3 deletions

diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 2e088c675..ad535cb92 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -258,8 +258,7 @@ private:
      *  does not set an account on the new folder.
       */
     Folder* addFolderInternal(FolderDefinition folderDefinition,
-                              AccountState* accountState,
-                              bool wipeJournal);
+                              AccountState* accountState);
 
     /* unloads a folder object, does not delete it */
     void unloadFolder( Folder * );
@@ -275,7 +274,7 @@ private:
     // restarts the application (Linux only)
     void restartApplication();
 
-    void setupFoldersHelper(QSettings& settings, AccountStatePtr account, bool mayMigrateOldDb);
+    void setupFoldersHelper(QSettings& settings, AccountStatePtr account, bool backwardsCompatible);
 
     QSet<Folder*>  _disabledFolders;
     Folder::Map    _folderMap;