Mercurial > pidgin

comparison libpurple/protocols/jabber/jabber.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 ba41f2a60253 a20ef7180680
children b4833db5eed0
comparison
equal deleted inserted replaced
21359:fe57b8062249 21360:e747ac0c42d6
1027 cbdata = g_new0(JabberRegisterCBData, 1); 1027 cbdata = g_new0(JabberRegisterCBData, 1);
1028 cbdata->js = js; 1028 cbdata->js = js;
1029 cbdata->who = g_strdup(from); 1029 cbdata->who = g_strdup(from);
1030 1030
1031 if(js->registration) 1031 if(js->registration)
1032 purple_request_fields(js->gc, _("Register New XMPP Account"), 1032 purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"),
1033 _("Register New XMPP Account"), instructions, fields, 1033 _("Register New XMPP Account"), instructions, fields,
1034 _("Register"), G_CALLBACK(jabber_register_cb), 1034 _("Register"), G_CALLBACK(jabber_register_cb),
1035 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), 1035 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
1036 purple_connection_get_account(js->gc), NULL, NULL, 1036 purple_connection_get_account(js->gc), NULL, NULL,
1037 cbdata); 1037 PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
1038 else { 1038 else {
1039 char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from) 1039 char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from)
1040 :g_strdup_printf(_("Register New Account at %s"), from); 1040 :g_strdup_printf(_("Register New Account at %s"), from);
1041 purple_request_fields(js->gc, title, 1041 purple_request_fields_with_hint(js->gc, title,
1042 title, instructions, fields, 1042 title, instructions, fields,
1043 registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb), 1043 registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb),
1044 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), 1044 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
1045 purple_connection_get_account(js->gc), NULL, NULL, 1045 purple_connection_get_account(js->gc), NULL, NULL,
1046 cbdata); 1046 PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
1047 g_free(title); 1047 g_free(title);
1048 } 1048 }
1049 1049
1050 g_free(instructions); 1050 g_free(instructions);
1051 } 1051 }
1736 "", FALSE); 1736 "", FALSE);
1737 purple_request_field_string_set_masked(field, TRUE); 1737 purple_request_field_string_set_masked(field, TRUE);
1738 purple_request_field_set_required(field, TRUE); 1738 purple_request_field_set_required(field, TRUE);
1739 purple_request_field_group_add_field(group, field); 1739 purple_request_field_group_add_field(group, field);
1740 1740
1741 purple_request_fields(js->gc, _("Change XMPP Password"), 1741 purple_request_fields_with_hint(js->gc, _("Change XMPP Password"),
1742 _("Change XMPP Password"), _("Please enter your new password"), 1742 _("Change XMPP Password"), _("Please enter your new password"),
1743 fields, _("OK"), G_CALLBACK(jabber_password_change_cb), 1743 fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
1744 _("Cancel"), NULL, 1744 _("Cancel"), NULL,
1745 purple_connection_get_account(gc), NULL, NULL, 1745 purple_connection_get_account(gc), NULL, NULL,
1746 js); 1746 PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
1747 } 1747 }
1748 1748
1749 GList *jabber_actions(PurplePlugin *plugin, gpointer context) 1749 GList *jabber_actions(PurplePlugin *plugin, gpointer context)
1750 { 1750 {
1751 PurpleConnection *gc = (PurpleConnection *) context; 1751 PurpleConnection *gc = (PurpleConnection *) context;