Mercurial > pidgin

comparison libpurple/protocols/jabber/jabber.c @ 16904:56042b2f8b64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s/Jabber/XMPP in user-visible places. This is the same as the changes in c0c4c168411c9fbc5ccb9790a43e21a62f6dcd55, except without the sedding of the .po files.
author Richard Laager <rlaager@wiktel.com>
date Sat, 05 May 2007 19:08:07 +0000
parents a77901ef0ebb
children 88444e60ea95
comparison
equal deleted inserted replaced
16903:11a0f2b4ac83 16904:56042b2f8b64
560 js->user = jabber_id_new(purple_account_get_username(account)); 560 js->user = jabber_id_new(purple_account_get_username(account));
561 js->next_id = g_random_int(); 561 js->next_id = g_random_int();
562 js->write_buffer = purple_circ_buffer_new(512); 562 js->write_buffer = purple_circ_buffer_new(512);
563 563
564 if(!js->user) { 564 if(!js->user) {
565 purple_connection_error(gc, _("Invalid Jabber ID")); 565 purple_connection_error(gc, _("Invalid XMPP ID"));
566 return; 566 return;
567 } 567 }
568 568
569 if(!js->user->resource) { 569 if(!js->user->resource) {
570 char *me; 570 char *me;
866 instructions = xmlnode_get_data(y); 866 instructions = xmlnode_get_data(y);
867 else 867 else
868 instructions = g_strdup(_("Please fill out the information below " 868 instructions = g_strdup(_("Please fill out the information below "
869 "to register your new account.")); 869 "to register your new account."));
870 870
871 purple_request_fields(js->gc, _("Register New Jabber Account"), 871 purple_request_fields(js->gc, _("Register New XMPP Account"),
872 _("Register New Jabber Account"), instructions, fields, 872 _("Register New XMPP Account"), instructions, fields,
873 _("Register"), G_CALLBACK(jabber_register_cb), 873 _("Register"), G_CALLBACK(jabber_register_cb),
874 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), 874 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
875 purple_connection_get_account(js->gc), NULL, NULL, 875 purple_connection_get_account(js->gc), NULL, NULL,
876 js); 876 js);
877 877
905 g_free, g_free); 905 g_free, g_free);
906 js->user = jabber_id_new(purple_account_get_username(account)); 906 js->user = jabber_id_new(purple_account_get_username(account));
907 js->next_id = g_random_int(); 907 js->next_id = g_random_int();
908 908
909 if(!js->user) { 909 if(!js->user) {
910 purple_connection_error(gc, _("Invalid Jabber ID")); 910 purple_connection_error(gc, _("Invalid XMPP ID"));
911 return; 911 return;
912 } 912 }
913 913
914 js->write_buffer = purple_circ_buffer_new(512); 914 js->write_buffer = purple_circ_buffer_new(512);
915 915
1372 field = purple_request_field_string_new("password2", _("Password (again)"), 1372 field = purple_request_field_string_new("password2", _("Password (again)"),
1373 "", FALSE); 1373 "", FALSE);
1374 purple_request_field_string_set_masked(field, TRUE); 1374 purple_request_field_string_set_masked(field, TRUE);
1375 purple_request_field_group_add_field(group, field); 1375 purple_request_field_group_add_field(group, field);
1376 1376
1377 purple_request_fields(js->gc, _("Change Jabber Password"), 1377 purple_request_fields(js->gc, _("Change XMPP Password"),
1378 _("Change Jabber Password"), _("Please enter your new password"), 1378 _("Change XMPP Password"), _("Please enter your new password"),
1379 fields, _("OK"), G_CALLBACK(jabber_password_change_cb), 1379 fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
1380 _("Cancel"), NULL, 1380 _("Cancel"), NULL,
1381 purple_connection_get_account(gc), NULL, NULL, 1381 purple_connection_get_account(gc), NULL, NULL,
1382 js); 1382 js);
1383 } 1383 }
1487 } else if(xmlnode_get_child(error, "internal-server-error")) { 1487 } else if(xmlnode_get_child(error, "internal-server-error")) {
1488 text = _("Internal Server Error"); 1488 text = _("Internal Server Error");
1489 } else if(xmlnode_get_child(error, "item-not-found")) { 1489 } else if(xmlnode_get_child(error, "item-not-found")) {
1490 text = _("Item Not Found"); 1490 text = _("Item Not Found");
1491 } else if(xmlnode_get_child(error, "jid-malformed")) { 1491 } else if(xmlnode_get_child(error, "jid-malformed")) {
1492 text = _("Malformed Jabber ID"); 1492 text = _("Malformed XMPP ID");
1493 } else if(xmlnode_get_child(error, "not-acceptable")) { 1493 } else if(xmlnode_get_child(error, "not-acceptable")) {
1494 text = _("Not Acceptable"); 1494 text = _("Not Acceptable");
1495 } else if(xmlnode_get_child(error, "not-allowed")) { 1495 } else if(xmlnode_get_child(error, "not-allowed")) {
1496 text = _("Not Allowed"); 1496 text = _("Not Allowed");
1497 } else if(xmlnode_get_child(error, "not-authorized")) { 1497 } else if(xmlnode_get_child(error, "not-authorized")) {