Mercurial > pidgin.yaz
changeset 21638:dc9d0141a35f
merge of 'c6cea9233a5f4d22b6b5f012bd8432d2732765ea'
and 'cbdc6d4cab03017c1c0267f861f9ed59407e1e61'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Mon, 26 Nov 2007 01:25:29 +0000 |
| parents | 844225b0c905 (diff) 1853d9d0cc65 (current diff) |
| children | fa5d1f426332 |
| files | |
| diffstat | 4 files changed, 24 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Nov 26 01:22:45 2007 +0000 +++ b/configure.ac Mon Nov 26 01:25:29 2007 +0000 @@ -46,8 +46,8 @@ m4_define([purple_lt_current], [3]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [3]) -m4_define([purple_micro_version], [0]) -m4_define([purple_version_suffix], []) +m4_define([purple_micro_version], [1]) +m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) @@ -55,8 +55,8 @@ m4_define([gnt_lt_current], [3]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [3]) -m4_define([gnt_micro_version], [0]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [1]) +m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/finch/libgnt/configure.ac Mon Nov 26 01:22:45 2007 +0000 +++ b/finch/libgnt/configure.ac Mon Nov 26 01:25:29 2007 +0000 @@ -27,8 +27,8 @@ m4_define([gnt_lt_current], [3]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [3]) -m4_define([gnt_micro_version], [0]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [1]) +m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/libpurple/protocols/jabber/libxmpp.c Mon Nov 26 01:22:45 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Mon Nov 26 01:25:29 2007 +0000 @@ -219,33 +219,31 @@ option); option = purple_account_option_bool_new( - _("Allow plaintext auth over unencrypted streams"), - "auth_plain_in_clear", FALSE); + _("Allow plaintext auth over unencrypted streams"), + "auth_plain_in_clear", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - + option); + option = purple_account_option_int_new(_("Connect port"), "port", 5222); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - + option); + option = purple_account_option_string_new(_("Connect server"), - "connect_server", NULL); + "connect_server", NULL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - -#if 0 /* TODO: Enable this when we're string unfrozen */ + option); + option = purple_account_option_string_new(_("File transfer proxies"), "ft_proxies", /* TODO: Is this an acceptable default? */ "proxy.jabber.org:7777"); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); -#endif jabber_init_plugin(plugin); - + purple_prefs_remove("/plugins/prpl/jabber"); - + /* XXX - If any other plugin wants SASL this won't be good ... */ #ifdef HAVE_CYRUS_SASL #ifdef _WIN32
--- a/libpurple/protocols/jabber/si.c Mon Nov 26 01:22:45 2007 +0000 +++ b/libpurple/protocols/jabber/si.c Mon Nov 26 01:25:29 2007 +0000 @@ -780,6 +780,9 @@ g_snprintf(port, sizeof(port), "%hu", portnum); + if(g_list_find_custom(jsx->streamhosts, ft_proxy_list[i], jabber_si_compare_jid) != NULL) + continue; + streamhost = xmlnode_new_child(query, "streamhost"); xmlnode_set_attrib(streamhost, "jid", ft_proxy_list[i]); xmlnode_set_attrib(streamhost, "host", ft_proxy_list[i]); @@ -801,7 +804,10 @@ /* TODO: deal with zeroconf proxies */ - if (!(sh->host && sh->port > 0)) + if (!(sh->jid && sh->host && sh->port > 0)) + continue; + + if(g_list_find_custom(jsx->streamhosts, sh->jid, jabber_si_compare_jid) != NULL) continue; streamhost = xmlnode_new_child(query, "streamhost");