pidgin: c34545ad: merge of '2c63599660bb7ed2aa17389e548fbc...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: c34545ad952a2b5ad30e9f1c5123dbc698672094
Ancestor: 2c63599660bb7ed2aa17389e548fbc0511b797ac
Ancestor: ce75e981fb02f075fc398b19d6ad5d2805046d0c
Author: markdoliner at pidgin.im
Date: 2008-12-12T04:02:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c34545ad952a2b5ad30e9f1c5123dbc698672094

Modified files:
        COPYRIGHT ChangeLog libpurple/account.c libpurple/blist.h
        libpurple/cmds.h libpurple/connection.h
        libpurple/conversation.h
        libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/AccountOpts.xs
        libpurple/plugins/perl/common/Certificate.xs
        libpurple/plugins/perl/common/Conversation.xs
        libpurple/plugins/perl/common/Prefs.xs
        libpurple/plugins/perl/common/Roomlist.xs
        libpurple/plugins/perl/common/Status.xs
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/im.h
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc10/wb.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.h
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/smiley.c pidgin/gtkutils.c
        pidgin/plugins/perl/common/GtkIMHtml.xs

ChangeLog: 

merge of '2c63599660bb7ed2aa17389e548fbc0511b797ac'
     and 'ce75e981fb02f075fc398b19d6ad5d2805046d0c'