Merge remote-tracking branch 'origin/avatar_pics'

Also fix compilation because of 22370fdbdadd06f0cacd249a8d7a32f0d3c1374e

Pull request #5482

diff --cc src/gui/settingsdialog.cpp
Simple merge

diff --cc src/libsync/account.cpp
Simple merge

diff --cc src/libsync/account.h
Simple merge

diff --cc src/libsync/connectionvalidator.cpp
Simple merge

diff --cc src/libsync/networkjobs.cpp
index 3ff312662fcd700b296e59cfb4402d142a8e2f4e,f89da5e6a5ccefd0ec3369360a22da85c7e55c04..3d3ee170e08092704ee247c3c45752be0a4d226b
--- 1/src/libsync/networkjobs.cpp
--- 2/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@@ -585,6 -590,42 +586,41 @@@ bool PropfindJob::finished(
  
  /*********************************************************************************************/
  
 -    setReply(davRequest("GET", _avatarUrl, req));
 -    setupConnections(reply());
+ AvatarJob::AvatarJob(AccountPtr account, QObject *parent)
+     : AbstractNetworkJob(account, QString(), parent)
+ {
+     _avatarUrl = Utility::concatUrlPath(account->url(), QString("remote.php/dav/avatars/%1/128.png").arg(account->davUser()));
+ }
+ 
+ void AvatarJob::start()
+ {
+     QNetworkRequest req;
++    sendRequest("GET", _avatarUrl, req);
+     AbstractNetworkJob::start();
+ }
+ 
+ bool AvatarJob::finished()
+ {
+     int http_result_code = reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+ 
+     QImage avImage;
+ 
+     if (http_result_code == 200) {
+ 
+         QByteArray pngData = reply()->readAll();
+         if( pngData.size() ) {
+ 
+             if( avImage.loadFromData(pngData) ) {
+                 qDebug() << "Retrieved Avatar pixmap!";
+             }
+         }
+     }
+     emit(avatarPixmap(avImage));
+     return true;
+ }
+ 
+ /*********************************************************************************************/
+ 
  ProppatchJob::ProppatchJob(AccountPtr account, const QString &path, QObject *parent)
      : AbstractNetworkJob(account, path, parent)
  {

diff --cc src/libsync/networkjobs.h
Simple merge