[evolution-data-server] Bug 782745 - Build failure of vapi bindings (xmlDocPtr ~> xmlDoc *)

[Milan Crha <mcrha src gnome org>]

commit 5e518989bcc23ccbd06c5ef929a47c7c094165c7
Author: Milan Crha <mcrha redhat com>
Date:   Thu May 18 08:54:46 2017 +0200

    Bug 782745 - Build failure of vapi bindings (xmlDocPtr ~> xmlDoc *)

 src/libedataserver/e-webdav-session.c |    2 +-
 src/libedataserver/e-webdav-session.h |    4 ++--
 src/libedataserver/e-xml-document.c   |    2 +-
 src/libedataserver/e-xml-document.h   |    2 +-
 src/libedataserver/e-xml-utils.c      |   22 +++++++++++-----------
 src/libedataserver/e-xml-utils.h      |   20 ++++++++++----------
 6 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/src/libedataserver/e-webdav-session.c b/src/libedataserver/e-webdav-session.c
index f509e68..1db6a2c 100644
--- a/src/libedataserver/e-webdav-session.c
+++ b/src/libedataserver/e-webdav-session.c
@@ -2633,7 +2633,7 @@ e_webdav_session_lock_sync (EWebDAVSession *webdav,
                            gint32 lock_timeout,
                            const EXmlDocument *xml,
                            gchar **out_lock_token,
-                           xmlDocPtr *out_xml_response,
+                           xmlDoc **out_xml_response,
                            GCancellable *cancellable,
                            GError **error)
 {
diff --git a/src/libedataserver/e-webdav-session.h b/src/libedataserver/e-webdav-session.h
index 8d15080..c20aa36 100644
--- a/src/libedataserver/e-webdav-session.h
+++ b/src/libedataserver/e-webdav-session.h
@@ -169,7 +169,7 @@ typedef enum {
  * Since: 3.26
  **/
 typedef gboolean (* EWebDAVPropstatTraverseFunc)       (EWebDAVSession *webdav,
-                                                        xmlXPathContextPtr xpath_ctx,
+                                                        xmlXPathContext *xpath_ctx,
                                                         const gchar *xpath_prop_prefix,
                                                         const SoupURI *request_uri,
                                                         const gchar *href,
@@ -463,7 +463,7 @@ gboolean    e_webdav_session_lock_sync              (EWebDAVSession *webdav,
                                                         gint32 lock_timeout,
                                                         const EXmlDocument *xml,
                                                         gchar **out_lock_token,
-                                                        xmlDocPtr *out_xml_response,
+                                                        xmlDoc **out_xml_response,
                                                         GCancellable *cancellable,
                                                         GError **error);
 gboolean       e_webdav_session_refresh_lock_sync      (EWebDAVSession *webdav,
diff --git a/src/libedataserver/e-xml-document.c b/src/libedataserver/e-xml-document.c
index c195699..87d97ef 100644
--- a/src/libedataserver/e-xml-document.c
+++ b/src/libedataserver/e-xml-document.c
@@ -137,7 +137,7 @@ e_xml_document_new (const gchar *ns_href,
  *
  * Since: 3.26
  **/
-xmlDocPtr
+xmlDoc *
 e_xml_document_get_xmldoc (EXmlDocument *xml)
 {
        g_return_val_if_fail (E_IS_XML_DOCUMENT (xml), NULL);
diff --git a/src/libedataserver/e-xml-document.h b/src/libedataserver/e-xml-document.h
index e1fcf94..b4177c5 100644
--- a/src/libedataserver/e-xml-document.h
+++ b/src/libedataserver/e-xml-document.h
@@ -76,7 +76,7 @@ GType         e_xml_document_get_type         (void) G_GNUC_CONST;
 
 EXmlDocument * e_xml_document_new              (const gchar *ns_href,
                                                 const gchar *root_element);
-xmlDocPtr      e_xml_document_get_xmldoc       (EXmlDocument *xml);
+xmlDoc *       e_xml_document_get_xmldoc       (EXmlDocument *xml);
 gchar *                e_xml_document_get_content      (const EXmlDocument *xml,
                                                 gsize *out_length);
 void           e_xml_document_add_namespaces   (EXmlDocument *xml,
diff --git a/src/libedataserver/e-xml-utils.c b/src/libedataserver/e-xml-utils.c
index 4b7a267..381a351 100644
--- a/src/libedataserver/e-xml-utils.c
+++ b/src/libedataserver/e-xml-utils.c
@@ -39,7 +39,7 @@
 #endif
 
 /**
- * e_xml_parse_file: (skip)
+ * e_xml_parse_file:
  * @filename: path to an XML file
  *
  * Reads a local XML file and parses the contents into an XML document
@@ -48,7 +48,7 @@
  *
  * Returns: (transfer full): an XML document structure, or %NULL
  **/
-xmlDocPtr
+xmlDoc *
 e_xml_parse_file (const gchar *filename)
 {
        xmlDocPtr result = NULL;
@@ -78,7 +78,7 @@ e_xml_parse_file (const gchar *filename)
  **/
 gint
 e_xml_save_file (const gchar *filename,
-                 xmlDocPtr doc)
+                 xmlDoc *doc)
 {
        gchar *filesave;
        xmlChar *xmlbuf;
@@ -152,7 +152,7 @@ e_xml_save_file (const gchar *filename,
 }
 
 /**
- * e_xml_get_child_by_name: (skip)
+ * e_xml_get_child_by_name:
  * @parent: an XML node structure
  * @child_name: element name of a child node
  *
@@ -191,7 +191,7 @@ e_xml_get_child_by_name (const xmlNode *parent,
  *
  * Since: 3.26
  **/
-xmlDocPtr
+xmlDoc *
 e_xml_parse_data (gconstpointer data,
                  gsize length)
 {
@@ -215,8 +215,8 @@ e_xml_parse_data (gconstpointer data,
  *
  * Since: 3.26
  **/
-xmlXPathContextPtr
-e_xml_new_xpath_context_with_namespaces (xmlDocPtr doc,
+xmlXPathContext *
+e_xml_new_xpath_context_with_namespaces (xmlDoc *doc,
                                         ...)
 {
        xmlXPathContextPtr xpath_ctx;
@@ -260,7 +260,7 @@ e_xml_new_xpath_context_with_namespaces (xmlDocPtr doc,
  * Since: 3.26
  **/
 void
-e_xml_xpath_context_register_namespaces (xmlXPathContextPtr xpath_ctx,
+e_xml_xpath_context_register_namespaces (xmlXPathContext *xpath_ctx,
                                         const gchar *prefix,
                                         const gchar *href,
                                         ...)
@@ -319,7 +319,7 @@ e_xml_xpath_context_register_namespaces (xmlXPathContextPtr xpath_ctx,
  *
  * Since: 3.26
  **/
-xmlXPathObjectPtr
+xmlXPathObject *
 e_xml_xpath_eval (xmlXPathContextPtr xpath_ctx,
                  const gchar *format,
                  ...)
@@ -368,7 +368,7 @@ e_xml_xpath_eval (xmlXPathContextPtr xpath_ctx,
  * Since: 3.26
  **/
 gchar *
-e_xml_xpath_eval_as_string (xmlXPathContextPtr xpath_ctx,
+e_xml_xpath_eval_as_string (xmlXPathContext *xpath_ctx,
                            const gchar *format,
                            ...)
 {
@@ -419,7 +419,7 @@ e_xml_xpath_eval_as_string (xmlXPathContextPtr xpath_ctx,
  * Since: 3.26
  **/
 gboolean
-e_xml_xpath_eval_exists (xmlXPathContextPtr xpath_ctx,
+e_xml_xpath_eval_exists (xmlXPathContext *xpath_ctx,
                         const gchar *format,
                         ...)
 {
diff --git a/src/libedataserver/e-xml-utils.h b/src/libedataserver/e-xml-utils.h
index 5222792..6707b6b 100644
--- a/src/libedataserver/e-xml-utils.h
+++ b/src/libedataserver/e-xml-utils.h
@@ -29,31 +29,31 @@
 
 G_BEGIN_DECLS
 
-xmlDocPtr      e_xml_parse_file                (const gchar *filename);
+xmlDoc *       e_xml_parse_file                (const gchar *filename);
 gint           e_xml_save_file                 (const gchar *filename,
-                                                xmlDocPtr doc);
+                                                xmlDoc *doc);
 xmlNode *      e_xml_get_child_by_name         (const xmlNode *parent,
                                                 const xmlChar *child_name);
 
-xmlDocPtr      e_xml_parse_data                (gconstpointer data,
+xmlDoc *       e_xml_parse_data                (gconstpointer data,
                                                 gsize length);
-xmlXPathContextPtr
+xmlXPathContext *
                e_xml_new_xpath_context_with_namespaces
-                                               (xmlDocPtr doc,
+                                               (xmlDoc *doc,
                                                 ...) G_GNUC_NULL_TERMINATED;
 void           e_xml_xpath_context_register_namespaces
-                                               (xmlXPathContextPtr xpath_ctx,
+                                               (xmlXPathContext *xpath_ctx,
                                                 const gchar *prefix,
                                                 const gchar *href,
                                                 ...) G_GNUC_NULL_TERMINATED;
-xmlXPathObjectPtr
-               e_xml_xpath_eval                (xmlXPathContextPtr xpath_ctx,
+xmlXPathObject *
+               e_xml_xpath_eval                (xmlXPathContext *xpath_ctx,
                                                 const gchar *format,
                                                 ...) G_GNUC_PRINTF (2, 3);
-gchar *                e_xml_xpath_eval_as_string      (xmlXPathContextPtr xpath_ctx,
+gchar *                e_xml_xpath_eval_as_string      (xmlXPathContext *xpath_ctx,
                                                 const gchar *format,
                                                 ...) G_GNUC_PRINTF (2, 3);
-gboolean       e_xml_xpath_eval_exists         (xmlXPathContextPtr xpath_ctx,
+gboolean       e_xml_xpath_eval_exists         (xmlXPathContext *xpath_ctx,
                                                 const gchar *format,
                                                 ...) G_GNUC_PRINTF (2, 3);