adium: 02e0ca16: propagate from branch 'im.pidgin.pidgin'...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 02e0ca1662c116c68da6eb796eb651ac09f5b021
Ancestor: 758aedc74285f2f518f540ef9b9a6f51678a7f8b
Ancestor: 7c65826a5afa5a4d23a96eb86db3615a666c031d
Author: zacw at adiumx.com
Date: 2009-10-16T22:54:58
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/02e0ca1662c116c68da6eb796eb651ac09f5b021

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_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
        share/ca-certs/Entrust.net_Secure_Server_CA.pem
Added directories:
        libpurple/protocols/facebook
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        NEWS configure.ac doc/pidgin.1.in finch/gntblist.c
        finch/libgnt/gntbindable.h finch/libgnt/gntbox.c
        finch/libgnt/gntcolors.c finch/libgnt/gntentry.c
        finch/libgnt/gntfilesel.c finch/libgnt/gnttextview.c
        finch/libgnt/gntutils.c finch/plugins/gnttinyurl.c
        libpurple/Makefile.am libpurple/account.c libpurple/blist.c
        libpurple/certificate.c libpurple/conversation.c
        libpurple/conversation.h libpurple/dnsquery.h
        libpurple/dnssrv.c libpurple/ft.c libpurple/ft.h
        libpurple/plugins/perl/common/Prpl.xs
        libpurple/plugins/perl/perl.c
        libpurple/plugins/ssl/ssl-gnutls.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/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/jabber.c
        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/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/tests/test_yahoo_util.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkprefs.c pidgin/gtkutils.c
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/xmppconsole.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
        po/POTFILES.in po/de.po po/vi.po share/ca-certs/Makefile.am
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 7c65826a5afa5a4d23a96eb86db3615a666c031d)
            to branch 'im.pidgin.adium' (head 758aedc74285f2f518f540ef9b9a6f51678a7f8b)