Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 21560:665e04562de0
This merge has the effect of reverting the hinting code from trunk.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 17 Nov 2007 00:12:30 +0000 |
parents | 4e5bef6c3379 fcb848b2d669 |
children | 28824f9f8e47 |
comparison
equal
deleted
inserted
replaced
21544:9b4d1af17ced | 21560:665e04562de0 |
---|---|
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_with_hint(js->gc, _("Register New XMPP Account"), | 1032 purple_request_fields(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 PURPLE_REQUEST_UI_HINT_REGISTER, cbdata); | 1037 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_with_hint(js->gc, title, | 1041 purple_request_fields(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 PURPLE_REQUEST_UI_HINT_REGISTER, cbdata); | 1046 cbdata); |
1047 g_free(title); | 1047 g_free(title); |
1048 } | 1048 } |
1049 | 1049 |
1050 g_free(instructions); | 1050 g_free(instructions); |
1051 } | 1051 } |
1738 "", FALSE); | 1738 "", FALSE); |
1739 purple_request_field_string_set_masked(field, TRUE); | 1739 purple_request_field_string_set_masked(field, TRUE); |
1740 purple_request_field_set_required(field, TRUE); | 1740 purple_request_field_set_required(field, TRUE); |
1741 purple_request_field_group_add_field(group, field); | 1741 purple_request_field_group_add_field(group, field); |
1742 | 1742 |
1743 purple_request_fields_with_hint(js->gc, _("Change XMPP Password"), | 1743 purple_request_fields(js->gc, _("Change XMPP Password"), |
1744 _("Change XMPP Password"), _("Please enter your new password"), | 1744 _("Change XMPP Password"), _("Please enter your new password"), |
1745 fields, _("OK"), G_CALLBACK(jabber_password_change_cb), | 1745 fields, _("OK"), G_CALLBACK(jabber_password_change_cb), |
1746 _("Cancel"), NULL, | 1746 _("Cancel"), NULL, |
1747 purple_connection_get_account(gc), NULL, NULL, | 1747 purple_connection_get_account(gc), NULL, NULL, |
1748 PURPLE_REQUEST_UI_HINT_ACCOUNT, js); | 1748 js); |
1749 } | 1749 } |
1750 | 1750 |
1751 GList *jabber_actions(PurplePlugin *plugin, gpointer context) | 1751 GList *jabber_actions(PurplePlugin *plugin, gpointer context) |
1752 { | 1752 { |
1753 PurpleConnection *gc = (PurpleConnection *) context; | 1753 PurpleConnection *gc = (PurpleConnection *) context; |