Mercurial > pidgin

comparison libpurple/protocols/jabber/jabber.c @ 21814:d20a1c190c2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed http://trac.adiumx.com/ticket/8529
author Andreas Monitzer <pidgin@monitzer.com>
date Tue, 11 Dec 2007 01:34:18 +0000
parents a4b6854737d5
children e13609ce4548
comparison
equal deleted inserted replaced
21813:d62d7412eca4 21814:d20a1c190c2f
534 static void tls_init(JabberStream *js) 534 static void tls_init(JabberStream *js)
535 { 535 {
536 purple_input_remove(js->gc->inpa); 536 purple_input_remove(js->gc->inpa);
537 js->gc->inpa = 0; 537 js->gc->inpa = 0;
538 js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd, 538 js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
539 jabber_login_callback_ssl, jabber_ssl_connect_failure, js->serverFQDN, js->gc); 539 jabber_login_callback_ssl, jabber_ssl_connect_failure, js->host, js->gc);
540 } 540 }
541 541
542 static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port) 542 static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
543 { 543 {
544 js->serverFQDN = g_strdup(fqdn); 544 js->serverFQDN = g_strdup(fqdn);
545 js->host = g_strdup(host);
545 546
546 if (purple_proxy_connect(js->gc, js->gc->account, host, 547 if (purple_proxy_connect(js->gc, js->gc->account, host,
547 port, jabber_login_callback, js->gc) == NULL) 548 port, jabber_login_callback, js->gc) == NULL)
548 purple_connection_error_reason (js->gc, 549 purple_connection_error_reason (js->gc,
549 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, 550 PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
1277 g_free(cmd->name); 1278 g_free(cmd->name);
1278 g_free(cmd); 1279 g_free(cmd);
1279 js->commands = g_list_delete_link(js->commands, js->commands); 1280 js->commands = g_list_delete_link(js->commands, js->commands);
1280 } 1281 }
1281 g_free(js->server_name); 1282 g_free(js->server_name);
1283 g_free(js->host);
1282 g_free(js->gmail_last_time); 1284 g_free(js->gmail_last_time);
1283 g_free(js->gmail_last_tid); 1285 g_free(js->gmail_last_tid);
1284 g_free(js->old_msg); 1286 g_free(js->old_msg);
1285 g_free(js->old_avatarhash); 1287 g_free(js->old_avatarhash);
1286 g_free(js->old_artist); 1288 g_free(js->old_artist);