[Pkg-owncloud-commits] [owncloud-client] 08/21: Theme: Revert logic of singleAccount switch.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit a3904f4d32e8e1d93a1262b0ecd34e0b582289cd
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Oct 19 12:26:42 2015 +0200

    Theme: Revert logic of singleAccount switch.
    
    To use the same logic as the other clients and unify ownBrander
    implementations, the switch is now called multiAccount() rather
    than singleAccount() with a reverse logic.
    Desktop Client stays with the default of having multiaacount
    enabled.
    
    Note that existing brandings need to rename the switch.
    
    https://github.com/owncloud/ownbrander/issues/443
---
 src/gui/generalsettings.cpp | 2 +-
 src/libsync/theme.cpp       | 4 ++--
 src/libsync/theme.h         | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 703dd29..c4a8e35 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -173,7 +173,7 @@ void GeneralSettings::slotAccountAddedOrRemoved()
 {
     _ui->addAccountButton->setVisible(
         AccountManager::instance()->accounts().isEmpty()
-            || !Theme::instance()->singleAccount());
+            || Theme::instance()->multiAccount());
 }
 
 
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 257c05b..17016b6 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -201,9 +201,9 @@ bool Theme::singleSyncFolder() const {
     return false;
 }
 
-bool Theme::singleAccount() const
+bool Theme::multiAccount() const
 {
-    return false;
+    return true;
 }
 
 QString Theme::defaultServerFolder() const
diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index 05acf80..d306244 100644
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -111,10 +111,11 @@ public:
      * Characteristics: bool if more than one sync folder is allowed
      */
     virtual bool singleSyncFolder() const;
+
     /**
-     * When true, there can only be one account.
+     * When true, client works with multiple accounts.
      */
-    virtual bool singleAccount() const;
+    virtual bool multiAccount() const;
 
     /**
     * URL to help file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git