1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
From 679b10d75730e81fa268e11cfda289a27fd3e306 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 13 Aug 2012 09:50:50 -0400
Subject: Bug 681321 - Support both old and new-buf libxml2 APIs
libxml2 changed the API for xmlOutputBuffer incompatibly.
See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 0219b34..f96907e 100644
--- calendar/backends/caldav/e-cal-backend-caldav.c
+++ calendar/backends/caldav/e-cal-backend-caldav.c
@@ -1188,6 +1188,19 @@ caldav_authenticate (ECalBackendCalDAV *cbdav,
return success;
}
+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
@@ -1198,6 +1211,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);
@@ -1230,11 +1245,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 (cbdav->priv->session, message, NULL);
@@ -1299,6 +1314,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
xmlDocPtr doc;
xmlNsPtr nsdav;
xmlNsPtr nscd;
+ gconstpointer buf_content;
+ gsize buf_size;
gboolean result;
/* Allocate the soup message */
@@ -1378,11 +1395,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav,
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 (cbdav->priv->session, message, NULL);
@@ -1795,6 +1812,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 (E_IS_CAL_BACKEND_CALDAV (cbdav), FALSE);
@@ -1820,11 +1839,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 (cbdav->priv->session, message, NULL);
@@ -1870,11 +1889,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 (cbdav->priv->session, message, NULL);
|
