public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server/files: evolution-data-server-3.2.3-caldav-cannot-modify.patch
@ 2012-02-24 23:22 Alexandre Rostovtsev (tetromino)
  0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-02-24 23:22 UTC (permalink / raw
  To: gentoo-commits

tetromino    12/02/24 23:22:11

  Added:               
                        evolution-data-server-3.2.3-caldav-cannot-modify.patch
  Log:
  Fix quoting problems with libical-0.48 (i.e. the 'existing event has different ETag' error), bug #405647 (thanks to Ole Craig for reporting).
  
  (Portage version: 2.2.0_alpha88/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/evolution-data-server/files/evolution-data-server-3.2.3-caldav-cannot-modify.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/files/evolution-data-server-3.2.3-caldav-cannot-modify.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/files/evolution-data-server-3.2.3-caldav-cannot-modify.patch?rev=1.1&content-type=text/plain

Index: evolution-data-server-3.2.3-caldav-cannot-modify.patch
===================================================================
commit 830fa86226aa2c4fd0687aef605c93920888e3c4
Author: Milan Crha <mcrha@redhat.com>
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/backends/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)
 
 	str =  icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
 
+	/* libical 0.48 escapes quotes, thus unescape them */
+	if (str && strchr (str, '\\')) {
+		gint ii, jj;
+
+		for (ii = 0, jj = 0; str[ii]; ii++) {
+			if (str[ii] == '\\') {
+				ii++;
+				if (!str[ii])
+					break;
+			}
+
+			str[jj] = str[ii];
+			jj++;
+		}
+
+		str[jj] = 0;
+	}
+
 	return str;
 }
 






^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-02-24 23:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-24 23:22 [gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server/files: evolution-data-server-3.2.3-caldav-cannot-modify.patch Alexandre Rostovtsev (tetromino)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox