Mercurial > pidgin
changeset 30175:fc8f98d1e81f
merge of '2e94598029dc6350d656fd335ad83738ff0c8e29'
and '5e3707fd727a9e7f1d26a84dbf06be284072fd1f'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 10 Jun 2010 20:35:08 +0000 |
| parents | 8cb39e235f39 (diff) 2a51b2c643d2 (current diff) |
| children | 27aff21c5eea |
| files | ChangeLog |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 10 00:37:52 2010 +0000 +++ b/ChangeLog Thu Jun 10 20:35:08 2010 +0000 @@ -1,6 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.7.2 (??/??/????): + libpurple: + * Fix the TURN server setting to work again since the media refactor. + Pidgin: * Re-focus the input area after clicking the attention toolbar button.
--- a/libpurple/media/backend-fs2.c Thu Jun 10 00:37:52 2010 +0000 +++ b/libpurple/media/backend-fs2.c Thu Jun 10 20:35:08 2010 +0000 @@ -1639,6 +1639,7 @@ g_value_set_boxed(&_params[_num_params].value, relay_info); g_value_array_free(relay_info); + _num_params++; } session = get_session(self, sess_id);