cpw.darkrain42.xmpp.iq-handlers: 6d9c213a: propagate from branch 'im.pidgin.pidgin'...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 6d9c213aab2232ead502ee9372ba6b72715ab7a1
Ancestor: 33f84ea59a9e7afb3a03806268589ea49622326a
Ancestor: f25348fdce436002d7d508f074aaa70fd9491f01
Author: paul at darkrain42.org
Date: 2009-04-03T16:45:38
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/6d9c213aab2232ead502ee9372ba6b72715ab7a1

Added files:
        finch/gntmedia.c finch/gntmedia.h libpurple/marshallers.list
        libpurple/media-gst.h libpurple/media.c libpurple/media.h
        libpurple/mediamanager.c libpurple/mediamanager.h
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/content.h
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/rawudp.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/jingle/transport.c
        libpurple/protocols/jabber/jingle/transport.h
        pidgin/gtkmedia.c pidgin/gtkmedia.h
        pidgin/pixmaps/toolbar/16/audio-call.png
        pidgin/pixmaps/toolbar/16/video-call.png
Added directories:
        libpurple/protocols/jabber/jingle
Modified files:
        ChangeLog ChangeLog.API configure.ac finch/Makefile.am
        finch/gntui.c finch/libgnt/gntkeys.h libpurple/Makefile.am
        libpurple/internal.h libpurple/network.c libpurple/network.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/iq.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/oob.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/roster.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
        libpurple/prpl.h libpurple/xmlnode.c libpurple/xmlnode.h
        pidgin/Makefile.am pidgin/Makefile.mingw pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkconvwin.h pidgin/gtkdialogs.c
        pidgin/gtkimhtmltoolbar.h pidgin/gtkmain.c pidgin/gtkprefs.c
        pidgin/gtkprefs.h pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/Makefile.am po/POTFILES.in
Modified attrs:
        pidgin/pixmaps/toolbar/16/audio-call.png
        pidgin/pixmaps/toolbar/16/video-call.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head f25348fdce436002d7d508f074aaa70fd9491f01)
            to branch 'im.pidgin.cpw.darkrain42.xmpp.iq-handlers' (head 33f84ea59a9e7afb3a03806268589ea49622326a)