adium: 534ffccf: propagate from branch 'im.pidgin.pidgin'...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 534ffccfd244372a8f2569168b1bc15b8c9d9054
Ancestor: 283a83db079ad50a17926e95bdba9f9d390bf695
Ancestor: 525b0e0a2e4dafdfa55b73e359709415f79bd872
Author: zacw at adiumx.com
Date: 2009-07-11T20:56:10
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/534ffccfd244372a8f2569168b1bc15b8c9d9054

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_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/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 ChangeLog.API configure.ac libpurple/Makefile.am
        libpurple/account.c libpurple/blist.c
        libpurple/conversation.c libpurple/conversation.h
        libpurple/plugins/ssl/ssl-nss.c
        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/chat.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_util.c libpurple/util.c
        libpurple/util.h pidgin/gtkconv.c pidgin/gtkutils.c
        pidgin/plugins/disco/gtkdisco.c pidgin.spec.in
        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 525b0e0a2e4dafdfa55b73e359709415f79bd872)
            to branch 'im.pidgin.adium' (head 283a83db079ad50a17926e95bdba9f9d390bf695)