[Pkg-owncloud-commits] [owncloud-client] 39/115: Merge pull request #2064 from owncloud/fix-1959

[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 3d6b622879baaf6d1b8f64166eef3ab66d829efd
Merge: 3909102 4c67a88
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Fri Aug 15 15:11:06 2014 +0200

    Merge pull request #2064 from owncloud/fix-1959
    
    Show folder icon a offline when account is offline

 src/mirall/accountsettings.cpp | 67 ++++++++++++++++++++++++++++++------------
 src/mirall/accountsettings.h   |  2 ++
 src/mirall/application.cpp     |  1 -
 src/mirall/folder.cpp          |  4 +--
 src/mirall/folderman.cpp       | 10 -------
 src/mirall/owncloudgui.cpp     |  4 +--
 src/mirall/owncloudtheme.cpp   |  6 ----
 src/mirall/owncloudtheme.h     |  1 -
 src/mirall/settingsdialog.cpp  | 28 +++++-------------
 src/mirall/settingsdialog.h    |  4 ++-
 src/mirall/syncresult.cpp      |  3 --
 src/mirall/syncresult.h        |  3 +-
 src/mirall/theme.cpp           | 18 +++++++-----
 src/mirall/theme.h             |  3 +-
 14 files changed, 78 insertions(+), 76 deletions(-)


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