Mercurial > pidgin.yaz

comparison libpurple/network.h @ 30953:025fe823a921

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge and a compilation error
author Marcus Lundblad <ml@update.uu.se>
date Sun, 14 Feb 2010 22:42:11 +0000
parents c55bba399426
children 422889fb57e0
comparison
equal deleted inserted replaced
30952:d873eeaccfc2 30953:025fe823a921
250 * @since 2.6.0 250 * @since 2.6.0
251 */ 251 */
252 void purple_network_set_turn_server(const gchar *turn_server); 252 void purple_network_set_turn_server(const gchar *turn_server);
253 253
254 /** 254 /**
255 * Get the IP address of the STUN server as a string representation 255 * Get the IP address of the TURN server as a string representation
256 * 256 *
257 * @return the IP address 257 * @return the IP address
258 * @since 2.6.0 258 * @since 2.6.0
259 */ 259 */
260 const gchar *purple_network_get_turn_ip(void); 260 const gchar *purple_network_get_turn_ip(void);