From 3582b54f31fb15d1f132a731ea8b22ac7f2c6254 Mon Sep 17 00:00:00 2001 From: Jussi Laitinen Date: Sun, 6 Mar 2011 18:49:27 +0200 Subject: [PATCH] Fix image get messages image fetching --- src/situareservice/imagefetcher.cpp | 7 +++++-- src/situareservice/situareservice.cpp | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/situareservice/imagefetcher.cpp b/src/situareservice/imagefetcher.cpp index aa3d341..bef3eda 100644 --- a/src/situareservice/imagefetcher.cpp +++ b/src/situareservice/imagefetcher.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "error.h" #include "network/networkaccessmanager.h" @@ -43,9 +44,11 @@ void ImageFetcher::fetchImage(const QString &id, const QUrl &url) { qDebug() << __PRETTY_FUNCTION__; - m_downloadQueue.insert(id, url); + if (url.isEmpty()) + return; - startNextDownload(); + m_downloadQueue.insert(id, url); + QTimer::singleShot(0, this, SLOT(startNextDownload())); } void ImageFetcher::startNextDownload() diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp index 2b7128d..9b969ee 100644 --- a/src/situareservice/situareservice.cpp +++ b/src/situareservice/situareservice.cpp @@ -325,7 +325,7 @@ void SituareService::parseInterestingPeopleData(const QByteArray &jsonReply) void SituareService::parseReply(const QByteArray &jsonReply, RequestName requestName) { - qWarning() << __PRETTY_FUNCTION__ << jsonReply; + qDebug() << __PRETTY_FUNCTION__ << jsonReply; QJson::Parser parser; bool ok; @@ -560,7 +560,7 @@ void SituareService::parseMessagesData(const QVariant &messagesData) received.append(message); - //emit fetchImage(message.id(), messageMap["image_url"].toString()); + emit fetchImage(message.id(), messageMap["pic_square"].toString()); } foreach (QVariant messageVariant, result["sent"].toList()) { @@ -588,7 +588,7 @@ void SituareService::parseMessagesData(const QVariant &messagesData) sent.append(message); - //emit fetchImage(message.id(), messageMap["image_url"].toString()); + emit fetchImage(message.id(), messageMap["pic_square"].toString()); } emit messagesReceived(received, sent); -- 1.7.9.5