pidgin: 5705f764: Fix merge error.

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 5705f7649aaeaec4e84ce7037f354d24f7fad7c7
Ancestor: d4f8aee1d3652ea813fb31dbfa3b480d28716dc9
Author: qulogic at pidgin.im
Date: 2009-06-08T04:42:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5705f7649aaeaec4e84ce7037f354d24f7fad7c7

Modified files:
        pidgin/plugins/disco/gtkdisco.c

ChangeLog: 

Fix merge error.

-------------- next part --------------
============================================================
--- pidgin/plugins/disco/gtkdisco.c	e3308d20faa2460f41011ff9e1227ce3fac10e83
+++ pidgin/plugins/disco/gtkdisco.c	82fddbf1a61758651af5b72d66aff108a39bb189
@@ -295,7 +295,7 @@ row_activated_cb(GtkTreeView       *tree
 		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);
 }