comparison: libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.c
- changeset 15800
- 2d0ec4fe2681
- parent 15783
- e2f6e431f5a6
- child 15884
- 4de1981757fc
equal
deleted
inserted
replaced
| 15799:ba7af742a0d1 | 15800:2d0ec4fe2681 |
|---|---|
| 502 jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc); | 502 jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc); |
| 503 } | 503 } |
| 504 | 504 |
| 505 static void jabber_login_connect(JabberStream *js, const char *server, int port) | 505 static void jabber_login_connect(JabberStream *js, const char *server, int port) |
| 506 { | 506 { |
| 507 #ifdef HAVE_CYRUS_SASL | |
| 508 js->serverFQDN = g_strdup(server); | |
| 509 #endif | |
| 510 | |
| 507 if (gaim_proxy_connect(js->gc, js->gc->account, server, | 511 if (gaim_proxy_connect(js->gc, js->gc->account, server, |
| 508 port, jabber_login_callback, js->gc) == NULL) | 512 port, jabber_login_callback, js->gc) == NULL) |
| 509 gaim_connection_error(js->gc, _("Unable to create socket")); | 513 gaim_connection_error(js->gc, _("Unable to create socket")); |
| 510 } | 514 } |
| 511 | 515 |
| 1005 sasl_dispose(&js->sasl); | 1009 sasl_dispose(&js->sasl); |
| 1006 if(js->sasl_mechs) | 1010 if(js->sasl_mechs) |
| 1007 g_string_free(js->sasl_mechs, TRUE); | 1011 g_string_free(js->sasl_mechs, TRUE); |
| 1008 if(js->sasl_cb) | 1012 if(js->sasl_cb) |
| 1009 g_free(js->sasl_cb); | 1013 g_free(js->sasl_cb); |
| 1014 if(js->serverFQDN) | |
| 1015 g_free(js->serverFQDN); | |
| 1010 #endif | 1016 #endif |
| 1011 g_free(js->server_name); | 1017 g_free(js->server_name); |
| 1012 g_free(js->gmail_last_time); | 1018 g_free(js->gmail_last_time); |
| 1013 g_free(js->gmail_last_tid); | 1019 g_free(js->gmail_last_tid); |
| 1014 g_free(js); | 1020 g_free(js); |
