Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 21360:e747ac0c42d6
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 | ba41f2a60253 a20ef7180680 |
children | b4833db5eed0 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sun Oct 14 21:20:50 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Mon Oct 15 10:45:46 2007 +0000 @@ -1029,21 +1029,21 @@ cbdata->who = g_strdup(from); if(js->registration) - purple_request_fields(js->gc, _("Register New XMPP Account"), + purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"), _("Register New XMPP Account"), instructions, fields, _("Register"), G_CALLBACK(jabber_register_cb), _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), purple_connection_get_account(js->gc), NULL, NULL, - cbdata); + PURPLE_REQUEST_UI_HINT_REGISTER, cbdata); else { char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from) :g_strdup_printf(_("Register New Account at %s"), from); - purple_request_fields(js->gc, title, + purple_request_fields_with_hint(js->gc, title, title, instructions, fields, registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb), _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), purple_connection_get_account(js->gc), NULL, NULL, - cbdata); + PURPLE_REQUEST_UI_HINT_REGISTER, cbdata); g_free(title); } @@ -1738,12 +1738,12 @@ purple_request_field_set_required(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields(js->gc, _("Change XMPP Password"), + purple_request_fields_with_hint(js->gc, _("Change XMPP Password"), _("Change XMPP Password"), _("Please enter your new password"), fields, _("OK"), G_CALLBACK(jabber_password_change_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, - js); + PURPLE_REQUEST_UI_HINT_ACCOUNT, js); } GList *jabber_actions(PurplePlugin *plugin, gpointer context)