libxml2 changed the API for xmlOutputBuffer incompatibly.
See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html
+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
/* Returns whether calendar changed on the server. This works only when server
* supports 'getctag' extension. */
static gboolean
xmlDocPtr doc;
xmlNodePtr root, node;
xmlNsPtr ns, nsdav;
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);
gboolean result = TRUE;
g_return_val_if_fail (cbdav != NULL, TRUE);
soup_message_headers_append (message->request_headers,
"Depth", "0");
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,
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 (cbdav->priv->session, message, NULL);
/* Send the request now */
send_and_handle_redirection (cbdav->priv->session, message, NULL);
xmlDocPtr doc;
xmlNsPtr nsdav;
xmlNsPtr nscd;
xmlDocPtr doc;
xmlNsPtr nsdav;
xmlNsPtr nscd;
+ gconstpointer buf_content;
+ gsize buf_size;
gboolean result;
/* Allocate the soup message */
gboolean result;
/* Allocate the soup message */
soup_message_headers_append (message->request_headers,
"Depth", "1");
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,
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 (cbdav->priv->session, message, NULL);
/* Send the request now */
send_and_handle_redirection (cbdav->priv->session, message, NULL);
xmlDocPtr doc;
xmlNodePtr root, node;
xmlNsPtr nsdav;
xmlDocPtr doc;
xmlNodePtr root, node;
xmlNsPtr nsdav;
+ gconstpointer buf_content;
+ gsize buf_size;
gchar *owner = NULL;
g_return_val_if_fail (E_IS_CAL_BACKEND_CALDAV (cbdav), FALSE);
gchar *owner = NULL;
g_return_val_if_fail (E_IS_CAL_BACKEND_CALDAV (cbdav), FALSE);
soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
soup_message_headers_append (message->request_headers, "Depth", "0");
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,
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 (cbdav->priv->session, message, NULL);
/* Send the request now */
send_and_handle_redirection (cbdav->priv->session, message, NULL);
soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
soup_message_headers_append (message->request_headers, "Depth", "0");
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,
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 (cbdav->priv->session, message, NULL);
/* Send the request now */
send_and_handle_redirection (cbdav->priv->session, message, NULL);
+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
+}
+
static void
ews_post_restarted_cb (SoupMessage *msg,
gpointer data)
{
xmlOutputBuffer *buf = data;
static void
ews_post_restarted_cb (SoupMessage *msg,
gpointer data)
{
xmlOutputBuffer *buf = data;
+ gconstpointer buf_content;
+ gsize buf_size;
/* In violation of RFC2616, libsoup will change a
* POST request to a GET on receiving a 302 redirect. */
g_debug ("Working around libsoup bug with redirect");
g_object_set (msg, SOUP_MESSAGE_METHOD, "POST", NULL);
/* In violation of RFC2616, libsoup will change a
* POST request to a GET on receiving a 302 redirect. */
g_debug ("Working around libsoup bug with redirect");
g_object_set (msg, SOUP_MESSAGE_METHOD, "POST", NULL);
+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
soup_message_set_request (
msg, "text/xml; charset=utf-8",
SOUP_MEMORY_COPY,
soup_message_set_request (
msg, "text/xml; charset=utf-8",
SOUP_MEMORY_COPY,
- (gchar *) buf->buffer->content,
- buf->buffer->use);
+ buf_content, buf_size);
xmlOutputBuffer *buf)
{
SoupMessage *msg;
xmlOutputBuffer *buf)
{
SoupMessage *msg;
+ gconstpointer buf_content;
+ gsize buf_size;
msg = soup_message_new (buf != NULL ? "POST" : "GET", url);
soup_message_headers_append (
msg->request_headers, "User-Agent", "libews/0.1");
if (buf != NULL) {
msg = soup_message_new (buf != NULL ? "POST" : "GET", url);
soup_message_headers_append (
msg->request_headers, "User-Agent", "libews/0.1");
if (buf != NULL) {
+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
soup_message_set_request (
msg, "text/xml; charset=utf-8",
SOUP_MEMORY_COPY,
soup_message_set_request (
msg, "text/xml; charset=utf-8",
SOUP_MEMORY_COPY,
- (gchar *) buf->buffer->content,
- buf->buffer->use);
+ buf_content, buf_size);
g_signal_connect (
msg, "restarted",
G_CALLBACK (ews_post_restarted_cb), buf);
g_signal_connect (
msg, "restarted",
G_CALLBACK (ews_post_restarted_cb), buf);