summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5f6f3c7)
svn path=/trunk/; revision=596
AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes")
AM_CONDITIONAL(HAVE_VOIP, test "x$enable_voip" = "xyes")
+
+# -----------------------------------------------------------
+# Misc
+# -----------------------------------------------------------
+AC_DEFINE_UNQUOTED([UNINSTALLED_GLADE_DIR], ["`pwd`/libempathy-gtk"], [path to glade files])
+AC_DEFINE_UNQUOTED([UNINSTALLED_DTD_DIR], ["`pwd`/libempathy"], [path to dtd files])
+
# -----------------------------------------------------------
AC_OUTPUT([
# -----------------------------------------------------------
AC_OUTPUT([
#include <string.h>
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
#include <string.h>
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
const char *name;
GtkWidget **widget_ptr;
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);
gui = glade_xml_new (path, root, domain);
g_free (path);
xmlDtd *dtd;
gboolean ret;
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, ":@&=+$,/?;");
/* The list of valid chars is taken from libxml. */
escaped = xmlURIEscapeStr (path, ":@&=+$,/?;");
g_free (path);
memset (&cvp, 0, sizeof (cvp));
g_free (path);
memset (&cvp, 0, sizeof (cvp));