# HG changeset patch # User Marcus Lundblad # Date 1232691616 0 # Node ID 4f0aec6d4ad792fa63ab8e0f6c685bf016afcb2e # Parent c56e8826fed005973109f918f119565b0b104eb2 Removed some extra tabs on blank lines diff -r c56e8826fed0 -r 4f0aec6d4ad7 libpurple/media.c --- a/libpurple/media.c Thu Jan 22 23:04:52 2009 +0000 +++ b/libpurple/media.c Fri Jan 23 06:20:16 2009 +0000 @@ -1623,7 +1623,7 @@ FsStream *fsstream = NULL; const gchar *stun_ip = purple_network_get_stun_ip(); const gchar *turn_ip = purple_network_get_turn_ip(); - + if (stun_ip || turn_ip) { guint new_num_params = stun_ip && turn_ip ? num_params + 2 : num_params + 1; @@ -1634,13 +1634,13 @@ if (stun_ip) { purple_debug_info("media", "setting property stun-ip on new stream: %s\n", stun_ip); - + param[next_param_index].name = "stun-ip"; g_value_init(¶m[next_param_index].value, G_TYPE_STRING); g_value_set_string(¶m[next_param_index].value, stun_ip); next_param_index++; } - + if (turn_ip) { GValueArray *relay_info = g_value_array_new(0); GValue value = {0}; @@ -1662,7 +1662,7 @@ gst_value_set_structure(&value, turn_setup); relay_info = g_value_array_append(relay_info, &value); gst_structure_free(turn_setup); - + purple_debug_info("media", "setting property relay-info on new stream\n"); param[next_param_index].name = "relay-info"; @@ -1679,9 +1679,8 @@ g_free(session); return FALSE; } - } - + fsstream = fs_session_new_stream(session->session, participant, type_direction & FS_DIRECTION_RECV, transmitter, diff -r c56e8826fed0 -r 4f0aec6d4ad7 libpurple/network.c --- a/libpurple/network.c Thu Jan 22 23:04:52 2009 +0000 +++ b/libpurple/network.c Fri Jan 23 06:20:16 2009 +0000 @@ -764,14 +764,14 @@ const char *error_message) { const gchar **ip = (const gchar **) data; - + if (error_message) { purple_debug_error("network", "lookup of IP address failed: %s\n", error_message); g_slist_free(hosts); return; } - + if (hosts && g_slist_next(hosts)) { size_t addr_len = (size_t) hosts->data; struct sockaddr *addr = g_slist_next(hosts)->data; @@ -784,7 +784,7 @@ inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr, dst, sizeof(dst)); } - + *ip = g_strdup(dst); purple_debug_info("network", "set IP address: %s\n", *ip); }