comparison libpurple/protocols/jabber/jabber.c @ 21095:cab348e39751

disapproval of revision '0e5385979f58d6ee74f668bb9b5dfd1ae3b6043f'
author Richard Laager <rlaager@wiktel.com>
date Sun, 14 Oct 2007 00:26:00 +0000
parents 8c9aad9479c0
children 84b9b98070e5 51cf02dbdb0e
comparison
equal deleted inserted replaced
21086:8c9aad9479c0 21095:cab348e39751
1000 cbdata = g_new0(JabberRegisterCBData, 1); 1000 cbdata = g_new0(JabberRegisterCBData, 1);
1001 cbdata->js = js; 1001 cbdata->js = js;
1002 cbdata->who = g_strdup(from); 1002 cbdata->who = g_strdup(from);
1003 1003
1004 if(js->registration) 1004 if(js->registration)
1005 purple_request_fields(js->gc, _("Register New XMPP Account"), 1005 purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"),
1006 _("Register New XMPP Account"), instructions, fields, 1006 _("Register New XMPP Account"), instructions, fields,
1007 _("Register"), G_CALLBACK(jabber_register_cb), 1007 _("Register"), G_CALLBACK(jabber_register_cb),
1008 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), 1008 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
1009 purple_connection_get_account(js->gc), NULL, NULL, 1009 purple_connection_get_account(js->gc), NULL, NULL,
1010 cbdata); 1010 "register-account", cbdata);
1011 else { 1011 else {
1012 char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from) 1012 char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from)
1013 :g_strdup_printf(_("Register New Account at %s"), from); 1013 :g_strdup_printf(_("Register New Account at %s"), from);
1014 purple_request_fields(js->gc, title, 1014 purple_request_fields_with_hint(js->gc, title,
1015 title, instructions, fields, 1015 title, instructions, fields,
1016 registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb), 1016 registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb),
1017 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), 1017 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
1018 purple_connection_get_account(js->gc), NULL, NULL, 1018 purple_connection_get_account(js->gc), NULL, NULL,
1019 cbdata); 1019 "register-account", cbdata);
1020 g_free(title); 1020 g_free(title);
1021 } 1021 }
1022 1022
1023 g_free(instructions); 1023 g_free(instructions);
1024 } 1024 }
1729 "", FALSE); 1729 "", FALSE);
1730 purple_request_field_string_set_masked(field, TRUE); 1730 purple_request_field_string_set_masked(field, TRUE);
1731 purple_request_field_set_required(field, TRUE); 1731 purple_request_field_set_required(field, TRUE);
1732 purple_request_field_group_add_field(group, field); 1732 purple_request_field_group_add_field(group, field);
1733 1733
1734 purple_request_fields(js->gc, _("Change XMPP Password"), 1734 purple_request_fields_with_hint(js->gc, _("Change XMPP Password"),
1735 _("Change XMPP Password"), _("Please enter your new password"), 1735 _("Change XMPP Password"), _("Please enter your new password"),
1736 fields, _("OK"), G_CALLBACK(jabber_password_change_cb), 1736 fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
1737 _("Cancel"), NULL, 1737 _("Cancel"), NULL,
1738 purple_connection_get_account(gc), NULL, NULL, 1738 purple_connection_get_account(gc), NULL, NULL,
1739 js); 1739 "account", js);
1740 } 1740 }
1741 1741
1742 GList *jabber_actions(PurplePlugin *plugin, gpointer context) 1742 GList *jabber_actions(PurplePlugin *plugin, gpointer context)
1743 { 1743 {
1744 PurpleConnection *gc = (PurpleConnection *) context; 1744 PurpleConnection *gc = (PurpleConnection *) context;