im.pidgin.pidgin: b7bc71beeea1f0d58d282c66c591928964e3b333
am at adiumx.com
am at adiumx.com
Mon Dec 10 20:40:39 EST 2007
-----------------------------------------------------------------
Revision: b7bc71beeea1f0d58d282c66c591928964e3b333
Ancestor: 18c53c7dce829060f09481fa0ab784049bad1c5e
Author: am at adiumx.com
Date: 2007-12-11T01:34:18
Branch: im.pidgin.pidgin
Modified files:
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
ChangeLog:
Fixed http://trac.adiumx.com/ticket/8529
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c 37a356263832da85c1ce5dac41c9c1204cb8f407
+++ libpurple/protocols/jabber/jabber.c eea6e7d81fa04f0cc37dae64741e2b910f56b45c
@@ -536,12 +536,13 @@ static void tls_init(JabberStream *js)
purple_input_remove(js->gc->inpa);
js->gc->inpa = 0;
js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
- jabber_login_callback_ssl, jabber_ssl_connect_failure, js->serverFQDN, js->gc);
+ jabber_login_callback_ssl, jabber_ssl_connect_failure, js->host, js->gc);
}
static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
{
js->serverFQDN = g_strdup(fqdn);
+ js->host = g_strdup(host);
if (purple_proxy_connect(js->gc, js->gc->account, host,
port, jabber_login_callback, js->gc) == NULL)
@@ -1279,6 +1280,7 @@ void jabber_close(PurpleConnection *gc)
js->commands = g_list_delete_link(js->commands, js->commands);
}
g_free(js->server_name);
+ g_free(js->host);
g_free(js->gmail_last_time);
g_free(js->gmail_last_tid);
g_free(js->old_msg);
============================================================
--- libpurple/protocols/jabber/jabber.h 9f3858e49283499a451c4f78dff6a1d782c20467
+++ libpurple/protocols/jabber/jabber.h bd69d4d5a3582c944f64074f736efab857b089d2
@@ -191,6 +191,8 @@ struct _JabberStream
char *old_uri;
int old_length;
char *old_track;
+
+ char *host;
};
typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *shortname, const gchar *namespace);
More information about the Commits
mailing list