Mercurial > pidgin.yaz
changeset 26515:c08719989149
merge of '1890ad1259c93f5ad18ceb3365717ebc43b30198'
and 'b28028a0f1c19eaf4ee7d941c83b587980320568'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sat, 04 Apr 2009 02:55:39 +0000 |
| parents | f171707b7d54 (diff) 0adf41b3de79 (current diff) |
| children | 30c870ee4ec9 4c1af7f30af8 882748e27f9d 8399b545925c |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Sat Apr 04 02:26:49 2009 +0000 +++ b/ChangeLog.API Sat Apr 04 02:55:39 2009 +0000 @@ -22,6 +22,10 @@ * purple_global_proxy_set_info * purple_log_get_activity_score * purple_network_force_online + * purple_network_set_stun_server + * purple_network_set_turn_server + * purple_network_get_stun_ip + * purple_network_get_turn_ip * purple_prpl_get_media_caps * purple_prpl_initiate_media * purple_request_field_get_group
--- a/libpurple/network.h Sat Apr 04 02:26:49 2009 +0000 +++ b/libpurple/network.h Sat Apr 04 02:55:39 2009 +0000 @@ -230,6 +230,7 @@ * Will result in a DNS query being executed asynchronous * * @param stun_server The host name of the STUN server to set + * @since 2.6.0 */ void purple_network_set_stun_server(const gchar *stun_server); @@ -237,6 +238,7 @@ * Get the IP address of the STUN server as a string representation * * @return the IP address + * @since 2.6.0 */ const gchar *purple_network_get_stun_ip(void); @@ -245,6 +247,7 @@ * Will result in a DNS query being executed asynchronous * * @param stun_server The host name of the STUN server to set + * @since 2.6.0 */ void purple_network_set_turn_server(const gchar *stun_server); @@ -252,6 +255,7 @@ * Get the IP address of the STUN server as a string representation * * @return the IP address + * @since 2.6.0 */ const gchar *purple_network_get_turn_ip(void);