[Pkg-owncloud-commits] [owncloud-client] 18/89: A different user constitutes a different account

[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 dff17ec08eb1d222b1da766a9c1d510639cdeb32
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Thu Dec 5 19:03:40 2013 +0100

    A different user constitutes a different account
    
    Fixes #1231
---
 src/creds/httpcredentials.cpp | 2 +-
 src/mirall/account.cpp        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/creds/httpcredentials.cpp b/src/creds/httpcredentials.cpp
index 6350c92..00d140f 100644
--- a/src/creds/httpcredentials.cpp
+++ b/src/creds/httpcredentials.cpp
@@ -136,7 +136,7 @@ bool HttpCredentials::changed(AbstractCredentials* credentials) const
 {
     HttpCredentials* other(dynamic_cast< HttpCredentials* >(credentials));
 
-    if (!other || other->user() != this->user()) {
+    if (!other || (other->user() != this->user())) {
         return true;
     }
 
diff --git a/src/mirall/account.cpp b/src/mirall/account.cpp
index d5aa35c..b452403 100644
--- a/src/mirall/account.cpp
+++ b/src/mirall/account.cpp
@@ -141,9 +141,9 @@ bool Account::changed(Account *other, bool ignoreUrlProtocol) const
     } else {
         changes = (_url == other->_url);
     }
-    if (!changes) {
-        changes = _credentials->changed(other->_credentials);
-    }
+
+    changes |= _credentials->changed(other->_credentials);
+
     return changes;
 }
 

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