X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy%2Fempathy-utils.c;h=4050f46738924c0e6c782e1c379f5449626792ad;hp=0e2c4b588d5a8f79913c7d38a8528526146b83d3;hb=84db00195ac91343c32c1d1e9e4301e8b0adc662;hpb=5f6f3c75f6ff002f92563b09e6d53710f7bbe193 diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 0e2c4b58..4050f467 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -208,11 +208,15 @@ empathy_xml_validate (xmlDoc *doc, xmlDtd *dtd; gboolean ret; - path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL); + path = g_build_filename (UNINSTALLED_DTD_DIR, dtd_filename, NULL); + if (!g_file_test (path, G_FILE_TEST_EXISTS)) { + g_free (path); + path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL); + } + empathy_debug (DEBUG_DOMAIN, "Loading dtd file %s", path); /* The list of valid chars is taken from libxml. */ escaped = xmlURIEscapeStr (path, ":@&=+$,/?;"); - g_free (path); memset (&cvp, 0, sizeof (cvp));