Mercurial > pidgin.yaz
changeset 22938:c0fc992da040
merge of '7fd0d8c5830d11a8f34c0d2fa6a6290427b182c4'
and 'cfa8bcce1dfa952cf5b50a0d15e1e15a63d1f120'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Wed, 14 May 2008 11:57:02 +0000 |
| parents | f96e73fbb9f4 (diff) 4798de46bf4a (current diff) |
| children | 917bc972a141 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Wed May 14 04:58:36 2008 +0000 +++ b/COPYRIGHT Wed May 14 11:57:02 2008 +0000 @@ -144,6 +144,7 @@ Evgueni V. Gavrilov Ignacy Gawedzki Georgi Georgiev +Thomas Gibson-Robinson Ike Gingerich Gustavo Giráldez Richard Gobeille
--- a/libpurple/protocols/jabber/jabber.c Wed May 14 04:58:36 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Wed May 14 11:57:02 2008 +0000 @@ -1327,6 +1327,7 @@ g_free(js->old_source); g_free(js->old_uri); g_free(js->old_track); + g_free(js->expected_rspauth); if (js->keepalive_timeout != -1) purple_timeout_remove(js->keepalive_timeout);