adium.1-4: 960a44e5: propagate from branch 'im.pidgin.pidgin'...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 960a44e5b738200f50808095288a3f2ab8d48193
Ancestor: 445565d4b6dcba4ba8565ff029be9b3710cd6ea9
Ancestor: dca326117c63899086cbb34178d48ec19c767111
Author: zacw at adiumx.com
Date: 2009-11-29T02:25:41
Branch: im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/960a44e5b738200f50808095288a3f2ab8d48193

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/dbus-server.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/bosh.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/namespaces.h
        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/notification.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c po/POTFILES.in po/ca.po
        po/fr.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 dca326117c63899086cbb34178d48ec19c767111)
            to branch 'im.pidgin.adium.1-4' (head 445565d4b6dcba4ba8565ff029be9b3710cd6ea9)