[Pkg-owncloud-commits] [owncloud-client] 217/498: Merge remote-tracking branch 'origin/master' into doxygenify

[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 eff4daa00bef2f031c4db4d6470d15c315927f41
Merge: 0735aa1 076f8ea
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Jun 29 18:45:55 2015 +0200

    Merge remote-tracking branch 'origin/master' into doxygenify
    
    Conflicts:
    	src/gui/quotainfo.h

 csync/src/csync_statedb.c         |  1 +
 src/gui/accountsettings.cpp       | 14 ++++--
 src/gui/accountsettings.h         |  6 ++-
 src/gui/accountstate.cpp          |  9 ----
 src/gui/accountstate.h            |  4 --
 src/gui/folderstatusmodel.cpp     |  4 +-
 src/gui/networksettings.cpp       | 31 +++++++++----
 src/gui/networksettings.ui        | 96 ++++++++++++++++++---------------------
 src/gui/owncloudgui.cpp           |  5 +-
 src/gui/quotainfo.cpp             | 56 ++++++++++++++---------
 src/gui/quotainfo.h               | 38 +++++++++++++---
 src/libsync/configfile.cpp        |  8 ++--
 src/libsync/configfile.h          |  4 +-
 src/libsync/propagatedownload.cpp |  2 +-
 src/libsync/utility.cpp           | 72 ++++++++++++++---------------
 src/libsync/utility.h             |  6 +--
 test/testutility.h                | 28 ++++++++++++
 17 files changed, 223 insertions(+), 161 deletions(-)

diff --cc src/gui/quotainfo.h
index bb19128,8b9377f..286bfca
--- a/src/gui/quotainfo.h
+++ b/src/gui/quotainfo.h
@@@ -17,16 -17,27 +17,30 @@@
  #include <QObject>
  #include <QPointer>
  #include <QVariant>
- 
- class QTimer;
+ #include <QTimer>
+ #include <QDateTime>
  
  namespace OCC {
- 
  class AccountState;
+ class PropfindJob;
  
 -/**
 - * This class handle the getting the quota to display in the UI
 +/*!
-  * \brief The QuotaInfo class
++ * \brief handles getting the quota to display in the UI 
++ *
+  * It is typically owned by the AccountSetting page.
+  *
+  * The quota is requested if those 3 conditions are met:
+  *  - This object is active via setActive() (typically if the settings page is visible.)
+  *  - The account is connected.
+  *  - Every 30 seconds (defaultIntervalT) or 5 seconds in case of failure (failIntervalT)
+  *
+  * We only request the quota when the UI is visible otherwise this might slow down the server with
+  * too many requests. But we still need to do it every 30 seconds otherwise user complains that the
+  * quota is not updated fast enough when changed on the server.
+  *
+  * If the quota job is not finished within 30 seconds, it is cancelled and another one is started
++ *
 + * \ingroup gui
   */
  class QuotaInfo : public QObject {
      Q_OBJECT

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