aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2008-01-20 08:49:40 +0800
committerGuillaume Desmottes <gdesmott@gnome.org>2008-01-20 08:49:40 +0800
commitae6b20744659a62a6ea08b36923a2427ad011677 (patch)
treedd733cf79e46b02bc23b6fe941a20e9fe6f2c025 /libempathy
parent2b2f9d95f002f058ca820121820cae631065b408 (diff)
downloadgsoc2013-empathy-ae6b20744659a62a6ea08b36923a2427ad011677.tar
gsoc2013-empathy-ae6b20744659a62a6ea08b36923a2427ad011677.tar.gz
gsoc2013-empathy-ae6b20744659a62a6ea08b36923a2427ad011677.tar.bz2
gsoc2013-empathy-ae6b20744659a62a6ea08b36923a2427ad011677.tar.lz
gsoc2013-empathy-ae6b20744659a62a6ea08b36923a2427ad011677.tar.xz
gsoc2013-empathy-ae6b20744659a62a6ea08b36923a2427ad011677.tar.zst
gsoc2013-empathy-ae6b20744659a62a6ea08b36923a2427ad011677.zip
parse user networks file
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-irc-network-manager.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index df53cd0d5..cfb07912d 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -345,13 +345,32 @@ load_global_file (EmpathyIrcNetworkManager *self)
}
static void
+load_user_file (EmpathyIrcNetworkManager *self)
+{
+ EmpathyIrcNetworkManagerPrivate *priv =
+ EMPATHY_IRC_NETWORK_MANAGER_GET_PRIVATE (self);
+
+ if (priv->user_file == NULL)
+ return;
+
+ if (!g_file_test (priv->user_file, G_FILE_TEST_EXISTS))
+ {
+ empathy_debug (DEBUG_DOMAIN, "User networks file %s doesn't exist",
+ priv->global_file);
+ return;
+ }
+
+ irc_network_manager_file_parse (self, priv->user_file);
+}
+
+static void
irc_network_manager_load_servers (EmpathyIrcNetworkManager *self)
{
EmpathyIrcNetworkManagerPrivate *priv =
EMPATHY_IRC_NETWORK_MANAGER_GET_PRIVATE (self);
- /* TODO: load user file */
load_global_file (self);
+ load_user_file (self);
priv->modified = FALSE;
}