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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 9fa62b5ddaebe515cc677ecd686d8d857a863174
Parent:   70b8a0e9987dff3de9c91b6e2b48c0b5f927cb6c
Parent:   b06bece32ea9fdee372ab449f51888151b3fedbc
Author:   malu at pidgin.im
Date:     08/19/10 15:29:51
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/9fa62b5ddaebe515cc677ecd686d8d857a863174

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head b06bece32ea9fdee372ab449f51888151b3fedbc)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 70b8a0e9987dff3de9c91b6e2b48c0b5f927cb6c)

Changes against parent 70b8a0e9987dff3de9c91b6e2b48c0b5f927cb6c

  dropped  libpurple/protocols/oscar/family_advert.c
  dropped  libpurple/protocols/oscar/family_invite.c
  dropped  libpurple/protocols/oscar/family_odir.c
  dropped  libpurple/protocols/oscar/family_translate.c
  added    libpurple/protocols/oscar/authorization.c
  added    libpurple/protocols/oscar/encoding.c
  added    libpurple/protocols/oscar/encoding.h
  added    libpurple/protocols/oscar/userinfo.c
  added    libpurple/protocols/oscar/visibility.c
  added    libpurple/protocols/oscar/visibility.h
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  finch/libgnt/gntentry.c
  patched  finch/libgnt/gnttextview.c
  patched  libpurple/log.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/network.c
  patched  libpurple/plugins/tcl/tcl_cmd.c
  patched  libpurple/plugins/tcl/tcl_signals.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/directconn.h
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.mingw
  patched  libpurple/protocols/oscar/bstream.c
  patched  libpurple/protocols/oscar/family_admin.c
  patched  libpurple/protocols/oscar/family_alert.c
  patched  libpurple/protocols/oscar/family_auth.c
  patched  libpurple/protocols/oscar/family_bart.c
  patched  libpurple/protocols/oscar/family_bos.c
  patched  libpurple/protocols/oscar/family_buddy.c
  patched  libpurple/protocols/oscar/family_chat.c
  patched  libpurple/protocols/oscar/family_chatnav.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/family_icq.c
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/protocols/oscar/family_oservice.c
  patched  libpurple/protocols/oscar/family_userlookup.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/misc.c
  patched  libpurple/protocols/oscar/msgcookie.c
  patched  libpurple/protocols/oscar/odc.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/peer_proxy.c
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  libpurple/protocols/oscar/snac.c
  patched  libpurple/protocols/oscar/tlv.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/qq/char_conv.c
  patched  libpurple/protocols/qq/qq.c
  patched  libpurple/protocols/qq/qq_trans.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoochat.c
  patched  libpurple/protocols/zephyr/ZVariables.c
  patched  libpurple/proxy.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtksourceundomanager.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/minidialog.c
  patched  pidgin/minidialog.h
  patched  pidgin/pixmaps/pidgin.ico
  patched  pidgin/plugins/xmppconsole.c
  patched  po/ChangeLog
  patched  po/hu.po
  patched  po/uk.po

Changes against parent b06bece32ea9fdee372ab449f51888151b3fedbc

  added    libpurple/protocols/jabber/jingle/file-transfer.c
  added    libpurple/protocols/jabber/jingle/file-transfer.h
  added    libpurple/protocols/jabber/jingle/ibbs.c
  added    libpurple/protocols/jabber/jingle/ibbs.h
  added    libpurple/protocols/jabber/jingle/s5b.c
  added    libpurple/protocols/jabber/jingle/s5b.h
  added    libpurple/protocols/jabber/socks5.c
  added    libpurple/protocols/jabber/socks5.h
  added    libpurple/protocols/jabber/xfer.c
  added    libpurple/protocols/jabber/xfer.h
  patched  libpurple/ft.c
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.mingw
  patched  libpurple/protocols/jabber/data.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/jingle.h
  patched  libpurple/protocols/jabber/jingle/rtp.c
  patched  libpurple/protocols/jabber/jingle/session.c
  patched  libpurple/protocols/jabber/jingle/session.h
  patched  libpurple/protocols/jabber/libxmpp.c
  patched  libpurple/protocols/jabber/si.c