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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: e5bdc641d63e0e30e039327e133de6ede785b174
Ancestor: 1890ad1259c93f5ad18ceb3365717ebc43b30198
Ancestor: 19a0590babf8f7d788faefbcea4815f240574a94
Author: malu at pidgin.im
Date: 2009-04-04T10:23:59
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/e5bdc641d63e0e30e039327e133de6ede785b174

Deleted entries:
        libpurple/protocols/toc/Makefile.am
        libpurple/protocols/toc/Makefile.mingw
        libpurple/protocols/toc/PROTOCOL
        libpurple/protocols/toc/toc.c
Added files:
        libpurple/media-gst.h
        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/jingle/s5b.c
        libpurple/protocols/jabber/jingle/s5b.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API Doxyfile.in
        doc/account-signals.dox finch/Makefile.am finch/gntaccount.c
        finch/gntblist.c finch/gntdebug.c finch/gntft.c
        finch/gntlog.c finch/gntmedia.c finch/gntmedia.h
        finch/gntnotify.c finch/gntplugin.c finch/gntpounce.c
        finch/gntrequest.c finch/gntroomlist.c finch/gntstatus.c
        finch/gntui.c finch/libgnt/Makefile.am
        finch/libgnt/wms/Makefile.am finch/libgnt/wms/s.c
        finch/plugins/Makefile.am libpurple/Makefile.am
        libpurple/blist.h libpurple/circbuffer.c
        libpurple/desktopitem.c libpurple/dnssrv.c
        libpurple/example/Makefile.am libpurple/internal.h
        libpurple/marshallers.list libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/network.h
        libpurple/ntlm.c libpurple/plugins/Makefile.am
        libpurple/plugins/mono/loader/debug-glue.c
        libpurple/plugins/mono/loader/mono.c
        libpurple/plugins/perl/Makefile.am
        libpurple/plugins/ssl/Makefile.am
        libpurple/plugins/tcl/Makefile.am
        libpurple/protocols/Makefile.am
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/gg.c
        libpurple/protocols/irc/Makefile.am
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.c
        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/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/rtp.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/novell/Makefile.am
        libpurple/protocols/novell/nmmessage.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/silc/Makefile.am
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/zephyr/Makefile.am libpurple/prpl.c
        libpurple/prpl.h libpurple/tests/test_util.c
        libpurple/util.c pidgin/Makefile.am pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkconvwin.h
        pidgin/gtkdebug.c pidgin/gtkdialogs.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c pidgin/gtkmedia.c
        pidgin/gtkmedia.h pidgin/gtknotify.c pidgin/gtknotify.h
        pidgin/gtkpounce.c pidgin/gtkprefs.c pidgin/gtkprefs.h
        pidgin/gtkroomlist.c pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/plugins/Makefile.am pidgin/plugins/cap/Makefile.am
        pidgin/plugins/gestures/Makefile.am
        pidgin/plugins/gevolution/Makefile.am
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.h
        pidgin/plugins/musicmessaging/Makefile.am
        pidgin/plugins/ticker/Makefile.am pidgin/win32/untar.c
        po/POTFILES.in po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 1890ad1259c93f5ad18ceb3365717ebc43b30198)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 19a0590babf8f7d788faefbcea4815f240574a94)