Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:linkedprojecttest
mingw32-evolution-data-server
0001-Bug-681321-Support-both-old-and-new-buf-li...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-Bug-681321-Support-both-old-and-new-buf-libxml2-APIs.patch of Package mingw32-evolution-data-server
From 01dd66b468182933dfcaade91ad6ff8aac662104 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters@verbum.org> Date: Mon, 13 Aug 2012 09:50:50 -0400 Subject: [PATCH] Bug 681321 - Support both old and new-buf libxml2 APIs Backported from commit 679b10d75730e81fa268e11cfda289a27fd3e306 --- calendar/backends/caldav/e-cal-backend-caldav.c | 39 +++++++++++++++++------ 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c index 80c5a39..32c3cda 100644 --- a/calendar/backends/caldav/e-cal-backend-caldav.c +++ b/calendar/backends/caldav/e-cal-backend-caldav.c @@ -1024,6 +1024,19 @@ caldav_server_open_calendar (ECalBackendCalDAV *cbdav, GError **perror) return FALSE; } +static gconstpointer +compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, + gsize *out_len) +{ +#ifdef LIBXML2_NEW_BUFFER + *out_len = xmlOutputBufferGetSize (buf); + return xmlOutputBufferGetContent (buf); +#else + *out_len = buf->buffer->use; + return buf->buffer->content; +#endif +} + /* Returns whether calendar changed on the server. This works only when server supports 'getctag' extension. */ static gboolean @@ -1035,6 +1048,8 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) xmlDocPtr doc; xmlNodePtr root, node; xmlNsPtr ns, nsdav; + gconstpointer buf_content; + gsize buf_size; gboolean result = TRUE; g_return_val_if_fail (cbdav != NULL, TRUE); @@ -1069,11 +1084,11 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) soup_message_headers_append (message->request_headers, "Depth", "0"); + buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, - (gchar *) buf->buffer->content, - buf->buffer->use); + buf_content, buf_size); /* Send the request now */ send_and_handle_redirection (priv->session, message, NULL); @@ -1131,6 +1146,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint xmlDocPtr doc; xmlNsPtr nsdav; xmlNsPtr nscd; + gconstpointer buf_content; + gsize buf_size; gboolean result; priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav); @@ -1211,11 +1228,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint soup_message_headers_append (message->request_headers, "Depth", "1"); + buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, - (gchar *) buf->buffer->content, - buf->buffer->use); + buf_content, buf_size); /* Send the request now */ send_and_handle_redirection (priv->session, message, NULL); @@ -1499,6 +1516,8 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) xmlDocPtr doc; xmlNodePtr root, node; xmlNsPtr nsdav; + gconstpointer buf_content; + gsize buf_size; gchar *owner = NULL; g_return_val_if_fail (cbdav != NULL, FALSE); @@ -1527,11 +1546,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); soup_message_headers_append (message->request_headers, "Depth", "0"); + buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, - (gchar *) buf->buffer->content, - buf->buffer->use); + buf_content, buf_size); /* Send the request now */ send_and_handle_redirection (priv->session, message, NULL); @@ -1577,11 +1596,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); soup_message_headers_append (message->request_headers, "Depth", "0"); + buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, - (gchar *) buf->buffer->content, - buf->buffer->use); + "application/xml", + SOUP_MEMORY_COPY, + buf_content, buf_size); /* Send the request now */ send_and_handle_redirection (priv->session, message, NULL); -- 1.7.10.4
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
