adium: 4f68fbd3: propagate from branch 'im.pidgin.pidgin'...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 4f68fbd3fa0d628ebaa502175933e527ae11f728
Ancestor: 1cac7cac77af89888c9e9819736317b28b63baca
Ancestor: 48750717fcacae911c85c052feb5dcdec0d8d5c3
Author: zacw at adiumx.com
Date: 2009-12-01T23:26:31
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/4f68fbd3fa0d628ebaa502175933e527ae11f728

Added files:
        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_conversation.c
        libpurple/protocols/facebook/fb_conversation.h
        libpurple/protocols/facebook/fb_friendlist.c
        libpurple/protocols/facebook/fb_friendlist.h
        libpurple/protocols/facebook/fb_info.c
        libpurple/protocols/facebook/fb_info.h
        libpurple/protocols/facebook/fb_json.c
        libpurple/protocols/facebook/fb_json.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/fb_util.c
        libpurple/protocols/facebook/fb_util.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
Added directories:
        libpurple/protocols/facebook
Modified files:
        ChangeLog configure.ac libpurple/Makefile.am
        libpurple/account.c libpurple/blist.c
        libpurple/conversation.c libpurple/conversation.h
        libpurple/protocols/Makefile.am
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c libpurple/xmlnode.c
        pidgin/plugins/disco/gtkdisco.c po/POTFILES.in
Modified attrs:
        libpurple/protocols/facebook/facebook16.png
        libpurple/protocols/facebook/facebook22.png
        libpurple/protocols/facebook/facebook48.png
        libpurple/protocols/facebook/fb_util.c
        libpurple/protocols/facebook/fb_util.h

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 1cac7cac77af89888c9e9819736317b28b63baca)
            to branch 'im.pidgin.adium' (head 48750717fcacae911c85c052feb5dcdec0d8d5c3)