From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S14T2-0004Fd-3x for garchives@archives.gentoo.org; Fri, 24 Feb 2012 23:22:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E013E0B15; Fri, 24 Feb 2012 23:22:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 059A3E0B19 for ; Fri, 24 Feb 2012 23:22:13 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D4A91B4007 for ; Fri, 24 Feb 2012 23:22:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2306) id E79892004C; Fri, 24 Feb 2012 23:22:11 +0000 (UTC) From: "Alexandre Rostovtsev (tetromino)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, tetromino@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server/files: evolution-data-server-3.2.3-caldav-cannot-modify.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: evolution-data-server-3.2.3-caldav-cannot-modify.patch X-VCS-Directories: gnome-extra/evolution-data-server/files X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev Content-Type: text/plain; charset=utf8 Message-Id: <20120224232211.E79892004C@flycatcher.gentoo.org> Date: Fri, 24 Feb 2012 23:22:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: af53d18b-3160-45c8-a658-bc41aa23aad2 X-Archives-Hash: 8354f21b5bca845f126ff673375a894f tetromino 12/02/24 23:22:11 Added: =20 evolution-data-server-3.2.3-caldav-cannot-modify.= patch Log: Fix quoting problems with libical-0.48 (i.e. the 'existing event has di= fferent ETag' error), bug #405647 (thanks to Ole Craig for reporting). =20 (Portage version: 2.2.0_alpha88/cvs/Linux x86_64) Revision Changes Path 1.1 gnome-extra/evolution-data-server/files/evolution-da= ta-server-3.2.3-caldav-cannot-modify.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolut= ion-data-server/files/evolution-data-server-3.2.3-caldav-cannot-modify.pa= tch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolut= ion-data-server/files/evolution-data-server-3.2.3-caldav-cannot-modify.pa= tch?rev=3D1.1&content-type=3Dtext/plain Index: evolution-data-server-3.2.3-caldav-cannot-modify.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D commit 830fa86226aa2c4fd0687aef605c93920888e3c4 Author: Milan Crha Date: Mon Jan 30 19:25:41 2012 +0100 Bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48) diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/b= ackends/caldav/e-cal-backend-caldav.c index 694e64a..50cece5 100644 --- a/calendar/backends/caldav/e-cal-backend-caldav.c +++ b/calendar/backends/caldav/e-cal-backend-caldav.c @@ -422,6 +422,24 @@ ecalcomp_get_etag (ECalComponent *comp) =20 str =3D icomp_x_prop_get (icomp, X_E_CALDAV "ETAG"); =20 + /* libical 0.48 escapes quotes, thus unescape them */ + if (str && strchr (str, '\\')) { + gint ii, jj; + + for (ii =3D 0, jj =3D 0; str[ii]; ii++) { + if (str[ii] =3D=3D '\\') { + ii++; + if (!str[ii]) + break; + } + + str[jj] =3D str[ii]; + jj++; + } + + str[jj] =3D 0; + } + return str; } =20