adium: 9c43783e: propagate from branch 'im.pidgin.pidgin'...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 9c43783e4eecc44905d07506d2d08efbaa2d6e4d
Ancestor: 7e1a5251180b65c5f9c3242f700497baf7062721
Ancestor: ef660d19c58b200a67bf94b3e8cbf0fd562a7f1d
Author: zacw at adiumx.com
Date: 2009-06-29T23:01:51
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/9c43783e4eecc44905d07506d2d08efbaa2d6e4d

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
        libpurple/protocols/oscar/clientlogin.c
        pidgin/plugins/disco/Makefile.mingw
Added directories:
        libpurple/protocols/facebook
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac libpurple/Makefile.am libpurple/account.c
        libpurple/blist.c libpurple/cipher.c
        libpurple/conversation.c libpurple/conversation.h
        libpurple/core.h libpurple/network.h
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/Makefile.am libpurple/protocols/gg/gg.c
        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/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/history.c
        libpurple/protocols/msn/history.h
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/Makefile.mingw
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_picture.c pidgin/gtkimhtml.c
        pidgin/gtknotify.c pidgin/gtkstatusbox.c
        pidgin/plugins/Makefile.mingw
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
        po/POTFILES.in po/ca.po
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 ef660d19c58b200a67bf94b3e8cbf0fd562a7f1d)
            to branch 'im.pidgin.adium' (head 7e1a5251180b65c5f9c3242f700497baf7062721)