From ef3204306ca354568754d552ed147496547c4ba4 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 3 Mar 2008 17:00:33 +0000 Subject: Don't hardcode path to uninstalled files, use EMPATHY_SRCDIR env var instead. svn path=/trunk/; revision=693 --- libempathy-gtk/empathy-account-widget-irc.c | 4 ++-- libempathy-gtk/empathy-ui-utils.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index 35fa7697f..5c74e0958 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -442,8 +442,8 @@ empathy_account_widget_irc_new (McAccount *account) user_file_with_path = g_build_filename (dir, IRC_NETWORKS_FILENAME, NULL); g_free (dir); - global_file_with_path = g_build_filename (UNINSTALLED_IRC_DIR, - IRC_NETWORKS_FILENAME, NULL); + global_file_with_path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), + "libempathy-gtk", IRC_NETWORKS_FILENAME, NULL); if (!g_file_test (global_file_with_path, G_FILE_TEST_EXISTS)) { g_free (global_file_with_path); diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index d5747a0ee..80dcd4227 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -65,7 +65,8 @@ get_glade_file (const gchar *filename, const char *name; GtkWidget **widget_ptr; - path = g_build_filename (UNINSTALLED_GLADE_DIR, filename, NULL); + path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "libempathy-gtk", + filename, NULL); if (!g_file_test (path, G_FILE_TEST_EXISTS)) { g_free (path); path = g_build_filename (DATADIR, "empathy", filename, NULL); -- cgit v1.2.3