[phodav: 8/18] wip: get rid of unnecesary method headers

[Marc-Andre Lureau <malureau src gnome org>]

commit e4a7f12a9ec13e027f6820ef637b8c40c6f812d7
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Thu Apr 10 17:57:19 2014 +0200

    wip: get rid of unnecesary method headers

 Makefile.am                        |    2 --
 libphodav/phodav-method-get.c      |    2 +-
 libphodav/phodav-method-get.h      |   31 -------------------------------
 libphodav/phodav-method-propfind.c |    1 -
 libphodav/phodav-method-propfind.h |   31 -------------------------------
 libphodav/phodav-priv.h            |    4 ++++
 libphodav/phodav-server.c          |    3 ---
 libphodav/phodav-utils.c           |    2 +-
 8 files changed, 6 insertions(+), 70 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2b13f5e..0df61d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,7 @@ libphodav_1_0_la_SOURCES =                    \
        libphodav/phodav-lock.c                 \
        libphodav/phodav-lock.h                 \
        libphodav/phodav-method-get.c           \
-       libphodav/phodav-method-get.h           \
        libphodav/phodav-method-propfind.c      \
-       libphodav/phodav-method-propfind.h      \
        libphodav/phodav-multistatus.c          \
        libphodav/phodav-multistatus.h          \
        libphodav/phodav-server.c               \
diff --git a/libphodav/phodav-method-get.c b/libphodav/phodav-method-get.c
index 4582d0c..dc5803e 100644
--- a/libphodav/phodav-method-get.c
+++ b/libphodav/phodav-method-get.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "phodav-method-get.h"
+#include "phodav-priv.h"
 
 static int
 compare_strings (gconstpointer a, gconstpointer b)
diff --git a/libphodav/phodav-method-propfind.c b/libphodav/phodav-method-propfind.c
index c56977e..50243bf 100644
--- a/libphodav/phodav-method-propfind.c
+++ b/libphodav/phodav-method-propfind.c
@@ -19,7 +19,6 @@
 #include "phodav-utils.h"
 #include "phodav-multistatus.h"
 #include "phodav-lock.h"
-#include "phodav-method-propfind.h"
 
 typedef struct _PropFind
 {
diff --git a/libphodav/phodav-priv.h b/libphodav/phodav-priv.h
index 7ee92cb..ab6d903 100644
--- a/libphodav/phodav-priv.h
+++ b/libphodav/phodav-priv.h
@@ -90,6 +90,10 @@ gboolean                server_foreach_parent_path           (PhodavServer *serv
                                                               const gchar *path,
                                                               PathCb cb, gpointer data);
 
+gint                    phodav_method_get                    (PathHandler *handler, SoupMessage *msg,
+                                                              const char *path, GError **err);
+gint                    phodav_method_propfind               (PathHandler *handler, SoupMessage *msg,
+                                                              const char *path, GError **err);
 G_END_DECLS
 
 #endif /* __PHODAV_PRIV_H__ */
diff --git a/libphodav/phodav-server.c b/libphodav/phodav-server.c
index 27d0249..3242b2b 100644
--- a/libphodav/phodav-server.c
+++ b/libphodav/phodav-server.c
@@ -30,9 +30,6 @@
 #include "phodav-lock.h"
 #include "phodav-utils.h"
 
-#include "phodav-method-get.h"
-#include "phodav-method-propfind.h"
-
 /**
  * SECTION:phodav-server
  * @title: PhodavServer
diff --git a/libphodav/phodav-utils.c b/libphodav/phodav-utils.c
index 7033440..5d23925 100644
--- a/libphodav/phodav-utils.c
+++ b/libphodav/phodav-utils.c
@@ -193,7 +193,7 @@ xml_node_has_name (xmlNodePtr node, const char *name)
   return xml_node_has_name_ns (node, name, "DAV:");
 }
 
-gboolean
+gboolean G_GNUC_PURE
 xml_node_is_element (xmlNodePtr node)
 {
   return node->type == XML_ELEMENT_NODE && node->name != NULL;