pidgin: 9b445b58: merge of '9a15955bb377eff51316851e03db1c...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 9b445b58d5e8b6ea8a6564f20865c206fce08d5a
Ancestor: 9a15955bb377eff51316851e03db1cd7a5f9ba7f
Ancestor: e75b094fb3636667360c46a4eb03b6974912d0ac
Author: rekkanoryo at pidgin.im
Date: 2008-12-11T08:41:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9b445b58d5e8b6ea8a6564f20865c206fce08d5a

Modified files:
        ChangeLog 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/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/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.c
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/im.h libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        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 '9a15955bb377eff51316851e03db1cd7a5f9ba7f'
     and 'e75b094fb3636667360c46a4eb03b6974912d0ac'