# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1244436153 0
# Node ID 8671d9a37002a5fe834350b6d11257c27d375058
# Parent  f7ef790f3a4451930d49fed9d27f2169d5b7e52d
Fix merge error.

diff -r f7ef790f3a44 -r 8671d9a37002 pidgin/plugins/disco/gtkdisco.c
--- a/pidgin/plugins/disco/gtkdisco.c	Mon Jun 08 04:40:58 2009 +0000
+++ b/pidgin/plugins/disco/gtkdisco.c	Mon Jun 08 04:42:33 2009 +0000
@@ -295,7 +295,7 @@
 		else
 			gtk_tree_view_expand_row(GTK_TREE_VIEW(pdl->tree), path, FALSE);
 	else if (service->flags & XMPP_DISCO_ADD)
-		add_room_to_blist_cb(GTK_BUTTON(pdl->dialog->add_button), pdl->dialog);
+		add_to_blist_cb(GTK_BUTTON(pdl->dialog->add_button), pdl->dialog);
 	else if (service->flags & XMPP_DISCO_REGISTER)
 		register_button_cb(GTK_BUTTON(pdl->dialog->register_button), pdl->dialog);
 }