Mercurial > pidgin
diff libpurple/protocols/jabber/chat.c @ 21098:7e200a629109
explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 02:13:14 +0000 |
parents | 84b9b98070e5 |
children | b9680933c2c6 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/chat.c Sat Oct 13 23:26:48 2007 +0000 +++ b/libpurple/protocols/jabber/chat.c Sun Oct 14 02:13:14 2007 +0000 @@ -778,14 +778,14 @@ purple_roomlist_set_fields(js->roomlist, fields); - purple_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"), + purple_request_input_with_hint(gc, _("Enter a Conference Server"), _("Enter a Conference Server"), _("Select a conference server to query"), js->chat_servers ? js->chat_servers->data : NULL, FALSE, FALSE, NULL, _("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb), _("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb), purple_connection_get_account(gc), NULL, NULL, - js); + "chat", js); return js->roomlist; }