Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/chat.c @ 21360:e747ac0c42d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.next.minor' (head bd8f1d754a1b94e5ade30c3b135178b236f7b49a) to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 5d84bcfaddc07cab4419ab9f04b31626421b97ff)
author Will Thompson <will.thompson@collabora.co.uk>
date Mon, 15 Oct 2007 10:45:46 +0000
parents bbcc9e206c43 a20ef7180680
children 665e04562de0
comparison
equal deleted inserted replaced
21359:fe57b8062249 21360:e747ac0c42d6
776 fields = g_list_append(fields, f); 776 fields = g_list_append(fields, f);
777 777
778 purple_roomlist_set_fields(js->roomlist, fields); 778 purple_roomlist_set_fields(js->roomlist, fields);
779 779
780 780
781 purple_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"), 781 purple_request_input_with_hint(gc, _("Enter a Conference Server"), _("Enter a Conference Server"),
782 _("Select a conference server to query"), 782 _("Select a conference server to query"),
783 js->chat_servers ? js->chat_servers->data : NULL, 783 js->chat_servers ? js->chat_servers->data : NULL,
784 FALSE, FALSE, NULL, 784 FALSE, FALSE, NULL,
785 _("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb), 785 _("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb),
786 _("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb), 786 _("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb),
787 purple_connection_get_account(gc), NULL, NULL, 787 purple_connection_get_account(gc), NULL, NULL,
788 js); 788 PURPLE_REQUEST_UI_HINT_CONV, js);
789 789
790 return js->roomlist; 790 return js->roomlist;
791 } 791 }
792 792
793 void jabber_roomlist_cancel(PurpleRoomlist *list) 793 void jabber_roomlist_cancel(PurpleRoomlist *list)