aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2008-02-04 04:42:54 +0800
committerGuillaume Desmottes <gdesmott@gnome.org>2008-02-04 04:42:54 +0800
commit0f5e43fda726832ad8d03671393f214efc01e146 (patch)
treeb8743edbcd2e4e8184667bf901ba9e877c9c4590 /libempathy-gtk
parent78ce1427403e5e2aa3aafae34805575bbc122126 (diff)
downloadgsoc2013-empathy-0f5e43fda726832ad8d03671393f214efc01e146.tar
gsoc2013-empathy-0f5e43fda726832ad8d03671393f214efc01e146.tar.gz
gsoc2013-empathy-0f5e43fda726832ad8d03671393f214efc01e146.tar.bz2
gsoc2013-empathy-0f5e43fda726832ad8d03671393f214efc01e146.tar.lz
gsoc2013-empathy-0f5e43fda726832ad8d03671393f214efc01e146.tar.xz
gsoc2013-empathy-0f5e43fda726832ad8d03671393f214efc01e146.tar.zst
gsoc2013-empathy-0f5e43fda726832ad8d03671393f214efc01e146.zip
don't hardcode user's networks file
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 7dd46252b..43d3483bf 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -432,7 +432,7 @@ GtkWidget *
empathy_account_widget_irc_new (McAccount *account)
{
EmpathyAccountWidgetIrc *settings;
- gchar *dir, *user_file_with_path;
+ gchar *dir, *user_file_with_path, *global_file_with_path;
GladeXML *glade;
GtkListStore *store;
GtkTreeIter iter;
@@ -451,10 +451,14 @@ 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);
+
settings->network_manager = empathy_irc_network_manager_new (
- /* FIXME: set the right paths */
- "/home/cassidy/gnome/empathy/tests/xml/default-irc-networks-sample.xml",
+ global_file_with_path,
user_file_with_path);
+
+ g_free (global_file_with_path);
g_free (user_file_with_path);
glade = empathy_glade_get_file ("empathy-account-widget-irc.glade",