Mercurial > pidgin
changeset 29240:ffcc5c128553
propagate from branch 'im.pidgin.pidgin' (head 21e0c593084b90bf269f264a4f54e3ac8ea291d9)
to branch 'im.pidgin.pidgin.next.minor' (head a70655460ab0929ece64f5b6a8df92846a67b162)
author | maiku@pidgin.im |
---|---|
date | Wed, 11 Nov 2009 05:40:59 +0000 |
parents | 52eef06b1829 (diff) 9da83d5f48c3 (current diff) |
children | 9549d3f8f7c2 |
files | libpurple/media.c libpurple/protocols/jabber/jingle/rtp.c pidgin/gtkcelllayout.c pidgin/gtkcelllayout.h pidgin/gtkcellrendererprogress.c pidgin/gtkcellrendererprogress.h pidgin/gtkcellview.c pidgin/gtkcellview.h pidgin/gtkcellviewmenuitem.c pidgin/gtkcellviewmenuitem.h pidgin/gtkexpander.c pidgin/gtkexpander.h pidgin/pidgincombobox.c pidgin/pidgincombobox.h |
diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/rtp.c Wed Nov 11 05:31:38 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Wed Nov 11 05:40:59 2009 +0000 @@ -880,7 +880,6 @@ } codecs = g_list_concat(codecs, remote_codecs); - g_list_free (remote_codecs); purple_media_set_remote_codecs(media, name, remote_jid, codecs);