Mercurial > pidgin
changeset 27083:8671d9a37002
Fix merge error.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 08 Jun 2009 04:42:33 +0000 |
| parents | f7ef790f3a44 |
| children | abf989278782 |
| files | pidgin/plugins/disco/gtkdisco.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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); }