soc.2008.masterpassword: b9aa9167: merge of '0e81c205c1156ee99e115c8bee75d6...

[scrouaf at soc.pidgin.im]

-----------------------------------------------------------------
Revision: b9aa916708d0fae7074d02a177500dafd5fe4e39
Ancestor: 0e81c205c1156ee99e115c8bee75d65f30305c27
Ancestor: 416bb144ae1d3030a1839755ff48c285164a30f3
Author: scrouaf at soc.pidgin.im
Date: 2008-08-11T04:04:12
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/b9aa916708d0fae7074d02a177500dafd5fe4e39

Deleted entries:
        libpurple/protocols/qq/crypt.c
        libpurple/protocols/qq/crypt.h
        libpurple/protocols/qq/group_network.c
        libpurple/protocols/qq/group_network.h
Added files:
        libpurple/plugins/keyrings/Makefile.am
        libpurple/plugins/keyrings/gnomekeyring.c
        libpurple/plugins/keyrings/internalkeyring.c
        libpurple/plugins/perl/common/Certificate.xs
        libpurple/plugins/perl/common/Idle.xs
        libpurple/plugins/perl/common/Whiteboard.xs
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_crypt.h
        pidgin/pixmaps/protocols/16/facebook.png
        pidgin/pixmaps/protocols/22/facebook.png
        pidgin/pixmaps/protocols/48/facebook.png
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        libpurple/certificate.c libpurple/keyring.h
        libpurple/plugins/Makefile.am
        libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/AccountOpts.xs
        libpurple/plugins/perl/common/BuddyIcon.xs
        libpurple/plugins/perl/common/BuddyList.xs
        libpurple/plugins/perl/common/Cipher.xs
        libpurple/plugins/perl/common/Connection.xs
        libpurple/plugins/perl/common/Conversation.xs
        libpurple/plugins/perl/common/Core.xs
        libpurple/plugins/perl/common/FT.xs
        libpurple/plugins/perl/common/Log.xs
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/common/Network.xs
        libpurple/plugins/perl/common/Notify.xs
        libpurple/plugins/perl/common/Plugin.xs
        libpurple/plugins/perl/common/PluginPref.xs
        libpurple/plugins/perl/common/Pounce.xs
        libpurple/plugins/perl/common/Prefs.xs
        libpurple/plugins/perl/common/Privacy.xs
        libpurple/plugins/perl/common/Proxy.xs
        libpurple/plugins/perl/common/Purple.xs
        libpurple/plugins/perl/common/Request.xs
        libpurple/plugins/perl/common/Roomlist.xs
        libpurple/plugins/perl/common/SSLConn.xs
        libpurple/plugins/perl/common/SavedStatuses.xs
        libpurple/plugins/perl/common/Server.xs
        libpurple/plugins/perl/common/Sound.xs
        libpurple/plugins/perl/common/Status.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/perl/common/module.h
        libpurple/plugins/perl/common/typemap
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/perl/perl.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_find.c
        libpurple/protocols/qq/group_find.h
        libpurple/protocols/qq/group_free.c
        libpurple/protocols/qq/group_free.h
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_im.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_internal.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_join.h
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/group_opt.h
        libpurple/protocols/qq/group_search.c
        libpurple/protocols/qq/header_info.c
        libpurple/protocols/qq/header_info.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_base.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/qq/sys_msg.h
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/sametime.c libpurple/upnp.c
        libpurple/util.c libpurple/util.h po/POTFILES.in po/de.po
        po/fi.po po/fr.po po/lt.po
Modified attrs:
        pidgin/pixmaps/protocols/16/facebook.png
        pidgin/pixmaps/protocols/22/facebook.png
        pidgin/pixmaps/protocols/48/facebook.png

ChangeLog: 

merge of '0e81c205c1156ee99e115c8bee75d65f30305c27'
     and '416bb144ae1d3030a1839755ff48c285164a30f3'