adium: a6a09114: propagate from branch 'im.pidgin.pidgin'...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: a6a091141aad2980ccbdc12b51ac6e9544ef8d79
Ancestor: 58b2ba106e563fcd0984b9438aa427f1d61e25e9
Ancestor: f6830aae63dd2f1ffe438068066ee2322d88d8e6
Author: evands at pidgin.im
Date: 2009-04-04T03:10:34
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/a6a091141aad2980ccbdc12b51ac6e9544ef8d79

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/facebook/COPYING
        libpurple/protocols/facebook/COPYRIGHT
        libpurple/protocols/facebook/Makefile.am
        libpurple/protocols/facebook/facebook.nsi
        libpurple/protocols/facebook/facebook16.png
        libpurple/protocols/facebook/facebook22.png
        libpurple/protocols/facebook/facebook48.png
        libpurple/protocols/facebook/fb_blist.c
        libpurple/protocols/facebook/fb_blist.h
        libpurple/protocols/facebook/fb_connection.c
        libpurple/protocols/facebook/fb_connection.h
        libpurple/protocols/facebook/fb_info.c
        libpurple/protocols/facebook/fb_info.h
        libpurple/protocols/facebook/fb_managefriends.c
        libpurple/protocols/facebook/fb_managefriends.h
        libpurple/protocols/facebook/fb_messages.c
        libpurple/protocols/facebook/fb_messages.h
        libpurple/protocols/facebook/fb_notifications.c
        libpurple/protocols/facebook/fb_notifications.h
        libpurple/protocols/facebook/fb_search.c
        libpurple/protocols/facebook/fb_search.h
        libpurple/protocols/facebook/libfacebook.c
        libpurple/protocols/facebook/libfacebook.h
        libpurple/protocols/facebook/login.facebook.com.pem
        libpurple/protocols/facebook/pidgin-facebookchat.rc
        libpurple/protocols/facebook/rss.xml
        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/facebook
        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/blist.c libpurple/internal.h libpurple/network.c
        libpurple/network.h libpurple/protocols/Makefile.am
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c 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/auth.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/soap.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/oscar/peer.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:
        libpurple/protocols/facebook/facebook16.png
        libpurple/protocols/facebook/facebook22.png
        libpurple/protocols/facebook/facebook48.png
        pidgin/pixmaps/toolbar/16/audio-call.png
        pidgin/pixmaps/toolbar/16/video-call.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 58b2ba106e563fcd0984b9438aa427f1d61e25e9)
            to branch 'im.pidgin.adium' (head f6830aae63dd2f1ffe438068066ee2322d88d8e6)