cpw.malu.xmpp.jingle_ft: a1415f65: propagate from branch 'im.pidgin.pidgin....

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: a1415f651d2be1535d13d2882c7ace37c4ed1294
Ancestor: 057a26d2c4d930206165a33a881afd9f0117f466
Ancestor: e49f3d8648da07481dd770c16d9efb77fcb0882e
Author: malu at pidgin.im
Date: 2009-03-21T12:43:47
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/a1415f651d2be1535d13d2882c7ace37c4ed1294

Added files:
        libpurple/protocols/jabber/jingle/file-transfer.c
        libpurple/protocols/jabber/jingle/file-transfer.h
        libpurple/protocols/jabber/jingle/ibbs.c
        libpurple/protocols/jabber/jingle/ibbs.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h
Modified files:
        configure.ac finch/gntmedia.c libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c pidgin/gtkmedia.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin.vv' (head 057a26d2c4d930206165a33a881afd9f0117f466)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head e49f3d8648da07481dd770c16d9efb77fcb0882e)