comparison libpurple/protocols/jabber/libxmpp.c @ 21603:a4b6854737d5

Implement more of XEP-0065 to support sending files through a proxy. To avoid adding strings this close to a release, it only supports using a proxy that is discovered from the server, but we'll include an account option to manually specify a ft proxy in the next release. Lots of this is based on a patch from galt - Fixes #3730, #116, #1768

21602:53fee49ce1c5

	option = purple_account_option_string_new(_("Connect server"),
											  "connect_server", NULL);
	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
											   option);
	
	
	jabber_init_plugin(plugin);
	
	purple_prefs_remove("/plugins/prpl/jabber");
	
	/* XXX - If any other plugin wants SASL this won't be good ... */

21603:a4b6854737d5

	option = purple_account_option_string_new(_("Connect server"),
											  "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 = 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 ... */