aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
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-gtk
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-gtk')
-rw-r--r--libempathy-gtk/empathy-ui-utils.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 2989ce2ac..22a5fc2f7 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -28,6 +28,8 @@
* Jeroen Zwartepoorte
*/
+#include <config.h>
+
#include <string.h>
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
@@ -63,7 +65,13 @@ get_glade_file (const gchar *filename,
const char *name;
GtkWidget **widget_ptr;
- path = g_build_filename (DATADIR, "empathy", filename, NULL);
+ path = g_build_filename (UNINSTALLED_GLADE_DIR, filename, NULL);
+ if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+ g_free (path);
+ path = g_build_filename (DATADIR, "empathy", filename, NULL);
+ }
+ empathy_debug (DEBUG_DOMAIN, "Loading glade file %s", path);
+
gui = glade_xml_new (path, root, domain);
g_free (path);