aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-01-23 08:02:03 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-01-23 08:02:03 +0800
commit84db00195ac91343c32c1d1e9e4301e8b0adc662 (patch)
tree4129ede4fc3f967fdf2d2562067d2198a231d50d /libempathy
parent5f6f3c75f6ff002f92563b09e6d53710f7bbe193 (diff)
downloadgsoc2013-empathy-84db00195ac91343c32c1d1e9e4301e8b0adc662.tar
gsoc2013-empathy-84db00195ac91343c32c1d1e9e4301e8b0adc662.tar.gz
gsoc2013-empathy-84db00195ac91343c32c1d1e9e4301e8b0adc662.tar.bz2
gsoc2013-empathy-84db00195ac91343c32c1d1e9e4301e8b0adc662.tar.lz
gsoc2013-empathy-84db00195ac91343c32c1d1e9e4301e8b0adc662.tar.xz
gsoc2013-empathy-84db00195ac91343c32c1d1e9e4301e8b0adc662.tar.zst
gsoc2013-empathy-84db00195ac91343c32c1d1e9e4301e8b0adc662.zip
Try to load dtd and glade files from the srcdir first to aboid having to install them each time we change them.
svn path=/trunk/; revision=596
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-utils.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 0e2c4b588..4050f4673 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));