aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.c2
-rw-r--r--libempathy-gtk/empathy-irc-network-dialog.c2
-rw-r--r--libempathy/empathy-irc-network-manager.c2
-rw-r--r--libempathy/empathy-irc-network.c6
-rw-r--r--libempathy/empathy-irc-network.h2
-rw-r--r--tests/check-empathy-irc-network-manager.c6
-rw-r--r--tests/check-empathy-irc-network.c4
7 files changed, 12 insertions, 12 deletions
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 167124c42..35fa7697f 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -392,7 +392,7 @@ account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
network = empathy_irc_network_new (server);
srv = empathy_irc_server_new (server, port, ssl);
- empathy_irc_network_add_server (network, srv);
+ empathy_irc_network_append_server (network, srv);
empathy_irc_network_manager_add (settings->network_manager, network);
gtk_list_store_insert_with_values (store, &iter, -1,
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 34934c48f..9a42c649c 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -285,7 +285,7 @@ irc_network_dialog_button_add_clicked_cb (GtkWidget *widget,
GTK_TREE_VIEW (dialog->treeview_servers)));
server = empathy_irc_server_new (_("new server"), 6667, FALSE);
- empathy_irc_network_add_server (dialog->network, server);
+ empathy_irc_network_append_server (dialog->network, server);
add_server_to_store (store, server, &iter);
path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index cda7945ff..f88b93bc7 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -508,7 +508,7 @@ irc_network_manager_parse_irc_server (EmpathyIrcNetwork *network,
address, port_nb, have_ssl);
server = empathy_irc_server_new (address, port_nb, have_ssl);
- empathy_irc_network_add_server (network, server);
+ empathy_irc_network_append_server (network, server);
}
if (address)
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index 3c9efcf50..f754adef6 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -268,7 +268,7 @@ empathy_irc_network_get_servers (EmpathyIrcNetwork *self)
}
/**
- * empathy_irc_network_add_server:
+ * empathy_irc_network_append_server:
* @network: an #EmpathyIrcNetwork
* @server: the #EmpathyIrcServer to add
*
@@ -277,8 +277,8 @@ empathy_irc_network_get_servers (EmpathyIrcNetwork *self)
*
*/
void
-empathy_irc_network_add_server (EmpathyIrcNetwork *self,
- EmpathyIrcServer *server)
+empathy_irc_network_append_server (EmpathyIrcNetwork *self,
+ EmpathyIrcServer *server)
{
EmpathyIrcNetworkPrivate *priv;
diff --git a/libempathy/empathy-irc-network.h b/libempathy/empathy-irc-network.h
index 2fd5c6177..ac146a183 100644
--- a/libempathy/empathy-irc-network.h
+++ b/libempathy/empathy-irc-network.h
@@ -67,7 +67,7 @@ EmpathyIrcNetwork * empathy_irc_network_new (const gchar *name);
GSList * empathy_irc_network_get_servers (EmpathyIrcNetwork *network);
-void empathy_irc_network_add_server (EmpathyIrcNetwork *network,
+void empathy_irc_network_append_server (EmpathyIrcNetwork *network,
EmpathyIrcServer *server);
void empathy_irc_network_remove_server (EmpathyIrcNetwork *network,
diff --git a/tests/check-empathy-irc-network-manager.c b/tests/check-empathy-irc-network-manager.c
index e5728066b..c3e853135 100644
--- a/tests/check-empathy-irc-network-manager.c
+++ b/tests/check-empathy-irc-network-manager.c
@@ -511,7 +511,7 @@ START_TEST (test_modify_user_file)
/* Add a new network */
network = empathy_irc_network_new ("Great Server");
server = empathy_irc_server_new ("irc.greatserver.com", 7873, TRUE);
- empathy_irc_network_add_server (network, server);
+ empathy_irc_network_append_server (network, server);
empathy_irc_network_manager_add (mgr, network);
g_object_unref (server);
g_object_unref (network);
@@ -672,7 +672,7 @@ START_TEST (test_modify_both_files)
EmpathyIrcServer *server;
server = empathy_irc_server_new ("us.undernet.org", 6667, FALSE);
- empathy_irc_network_add_server (network, server);
+ empathy_irc_network_append_server (network, server);
g_object_unref (server);
network_modified[3] = TRUE;
@@ -694,7 +694,7 @@ START_TEST (test_modify_both_files)
/* Add a new network */
network = empathy_irc_network_new ("Great Server");
server = empathy_irc_server_new ("irc.greatserver.com", 7873, TRUE);
- empathy_irc_network_add_server (network, server);
+ empathy_irc_network_append_server (network, server);
empathy_irc_network_manager_add (mgr, network);
g_object_unref (server);
g_object_unref (network);
diff --git a/tests/check-empathy-irc-network.c b/tests/check-empathy-irc-network.c
index 7ab356506..b8124a305 100644
--- a/tests/check-empathy-irc-network.c
+++ b/tests/check-empathy-irc-network.c
@@ -82,7 +82,7 @@ add_servers (EmpathyIrcNetwork *network,
server = empathy_irc_server_new (servers[i].address,
servers[i].port, servers[i].ssl);
modified = FALSE;
- empathy_irc_network_add_server (network, server);
+ empathy_irc_network_append_server (network, server);
fail_if (!modified);
g_object_unref (server);
}
@@ -147,7 +147,7 @@ START_TEST (test_modified_signal_because_of_server)
g_signal_connect (network, "modified", G_CALLBACK (modified_cb), NULL);
server = empathy_irc_server_new ("server1", 6667, FALSE);
- empathy_irc_network_add_server (network, server);
+ empathy_irc_network_append_server (network, server);
/* Change server properties */
modified = FALSE;