Mercurial > pidgin

comparison libpurple/protocols/jabber/jabber.c @ 25888:4e8748f3374f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicit merge of 'cfb115ff00c406f8011c0d661d33bee60813b27c' and '65a6b2bf1ab03c791a4444120e325ce42d9471f2'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:23:38 +0000
parents 367b3ddcf5c3 a0b89076a163
children 43b721aa4b76
comparison
equal deleted inserted replaced
25887:47540809ae91 25888:4e8748f3374f
1411 purple_connection_update_progress(js->gc, _("Authenticating"), 1411 purple_connection_update_progress(js->gc, _("Authenticating"),
1412 js->gsc ? 7 : 3, JABBER_CONNECT_STEPS); 1412 js->gsc ? 7 : 3, JABBER_CONNECT_STEPS);
1413 if(js->protocol_version == JABBER_PROTO_0_9 && js->registration) { 1413 if(js->protocol_version == JABBER_PROTO_0_9 && js->registration) {
1414 jabber_register_start(js); 1414 jabber_register_start(js);
1415 } else if(js->auth_type == JABBER_AUTH_IQ_AUTH) { 1415 } else if(js->auth_type == JABBER_AUTH_IQ_AUTH) {
1416 /* with dreamhost's xmpp server at least, you have to
1417 specify a resource or you will get a "406: Not
1418 Acceptable"
1419 */
1420 if(!js->user->resource || *js->user->resource == '\0') {
1421 g_free(js->user->resource);
1422 js->user->resource = g_strdup("Home");
1423 }
1424
1416 jabber_auth_start_old(js); 1425 jabber_auth_start_old(js);
1417 } 1426 }
1418 break; 1427 break;
1419 case JABBER_STREAM_REINITIALIZING: 1428 case JABBER_STREAM_REINITIALIZING:
1420 purple_connection_update_progress(js->gc, _("Re-initializing Stream"), 1429 purple_connection_update_progress(js->gc, _("Re-initializing Stream"),