Merge branch 'gnome-3-8'

[empathy.git] / libempathy / empathy-utils.c

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index e074327b636e94aea968a59e93108c625c68d2c6..c9eb5ca6f9b9a2d016fa1bc6f1390516723fcae9 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -27,17 +27,14 @@
  */
 
 #include "config.h"
+#include "empathy-utils.h"
 
 #include <glib/gi18n-lib.h>
-
-#include <libxml/uri.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-utils.h"
 #include "empathy-presence-manager.h"
-
-#include <extensions/extensions.h>
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
@@ -143,41 +140,6 @@ empathy_xml_validate_from_resource (xmlDoc *doc,
   return ret;
 }
 
-gboolean
-empathy_xml_validate (xmlDoc      *doc,
-    const gchar *dtd_filename)
-{
-  gchar *path;
-  xmlChar *escaped;
-  xmlValidCtxt  cvp;
-  xmlDtd *dtd;
-  gboolean ret;
-
-  path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "libempathy",
-         dtd_filename, NULL);
-  if (!g_file_test (path, G_FILE_TEST_EXISTS))
-    {
-      g_free (path);
-      path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL);
-    }
-
-  DEBUG ("Loading dtd file %s", path);
-
-  /* The list of valid chars is taken from libxml. */
-  escaped = xmlURIEscapeStr ((const xmlChar *) path,
-    (const xmlChar *)":@&=+$,/?;");
-  g_free (path);
-
-  memset (&cvp, 0, sizeof (cvp));
-  dtd = xmlParseDTD (NULL, escaped);
-  ret = xmlValidateDtd (&cvp, doc, dtd);
-
-  xmlFree (escaped);
-  xmlFreeDtd (dtd);
-
-  return ret;
-}
-
 xmlNodePtr
 empathy_xml_node_get_child (xmlNodePtr   node,
     const gchar *child_name)