comparison libpurple/protocols/jabber/jabber.c @ 23024:01a08e285073

applied changes from f3703d89403f9f8e8b927beeb2f2ac05628c371d through d99b567b2df0833b855496e7466e6c4c2d9d2329
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 19 Jun 2008 03:10:50 +0000
parents 9dc7e1d4da15
children 5c70d953a497
comparison
equal deleted inserted replaced
23023:0f94ed7e362b 23024:01a08e285073
625 js->user = jabber_id_new(purple_account_get_username(account)); 625 js->user = jabber_id_new(purple_account_get_username(account));
626 js->next_id = g_random_int(); 626 js->next_id = g_random_int();
627 js->write_buffer = purple_circ_buffer_new(512); 627 js->write_buffer = purple_circ_buffer_new(512);
628 js->old_length = 0; 628 js->old_length = 0;
629 js->keepalive_timeout = -1; 629 js->keepalive_timeout = -1;
630 js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user->domain); 630 js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL);
631 631
632 if(!js->user) { 632 if(!js->user) {
633 purple_connection_error_reason (gc, 633 purple_connection_error_reason (gc,
634 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, 634 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
635 _("Invalid XMPP ID")); 635 _("Invalid XMPP ID"));