Hello community, here is the log from the commit of package libkgapi for openSUSE:Factory checked in at 2013-12-09 07:08:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkgapi (Old) and /work/SRC/openSUSE:Factory/.libkgapi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkgapi" Changes: -------- --- /work/SRC/openSUSE:Factory/libkgapi/libkgapi.changes 2013-06-15 12:30:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkgapi.new/libkgapi.changes 2013-12-09 07:08:08.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 6 23:46:35 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 2.0.2 + * Add support for Microsoft Standard Time Zones + * Respect calendar-wide timezones +- Added 0001-When-fetching-last-contact-photo-fails-don-t-fail-th.patch, + for resolving kde#328422, where the synchronization of google resource + could fail of contact wouldn't have a photo + +------------------------------------------------------------------- Old: ---- libkgapi-2.0.1.tar.bz2 New: ---- 0001-When-fetching-last-contact-photo-fails-don-t-fail-th.patch libkgapi-2.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkgapi.spec ++++++ --- /var/tmp/diff_new_pack.Mb6qLY/_old 2013-12-09 07:08:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Mb6qLY/_new 2013-12-09 07:08:09.000000000 +0100 @@ -17,13 +17,15 @@ Name: libkgapi -Version: 2.0.1 +Version: 2.0.2 Release: 0 Summary: Extension for accessing your Google data License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.progdan.cz/ -Source0: http://download.kde.org/stable/libkgapi/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 0001-When-fetching-last-contact-photo-fails-don-t-fail-th.patch -- kde#328422 +Patch0: 0001-When-fetching-last-contact-photo-fails-don-t-fail-th.patch BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libqjson-devel @@ -95,6 +97,7 @@ %lang_package %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build %cmake_kde4 -d build ++++++ 0001-When-fetching-last-contact-photo-fails-don-t-fail-th.patch ++++++ >From c8c1a5b0410cae422a539333b8d37a1279a40817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvra...@redhat.com> Date: Fri, 6 Dec 2013 10:58:29 +0100 Subject: [PATCH 1/1] When fetching last contact photo fails, don't fail the entire job Job::replyReceived() sets error to NotFound if it receives 404. In case of ContactPhotosFetchJob that's not a fatal error though, but a notification that the contact does not have a photo. Subsequent success will reset the error, but in case the very last contact does not have a photo, the error would remain set to NotFound, which would then fail the entire task in Google resource. BUG: 328422 FIXED-IN: 2.0.3 --- libkgapi2/contacts/contactfetchphotojob.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libkgapi2/contacts/contactfetchphotojob.cpp b/libkgapi2/contacts/contactfetchphotojob.cpp index 1395764..ac64e5b 100644 --- a/libkgapi2/contacts/contactfetchphotojob.cpp +++ b/libkgapi2/contacts/contactfetchphotojob.cpp @@ -96,6 +96,10 @@ void ContactFetchPhotoJob::handleReply(const QNetworkReply *reply, const QByteAr if (reply->error() == QNetworkReply::ContentNotFoundError) { d->contacts.currentProcessed(); d->processNextContact(); + // If the last photo failed, make sure we don't fail the whole job! + setError(KGAPI2::NoError); + setErrorString(QString()); + return; } ContactPtr contact = reply->request().attribute(QNetworkRequest::User).value<ContactPtr>(); -- 1.8.4.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
