pidgin: 665a0778: merge of '1203a733696f95eef53b04b5078e0a...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: 665a07783e325291cdd356dacf8f394fb18f0031
Ancestor: 1203a733696f95eef53b04b5078e0a779371b4d3
Ancestor: 5981a2262230950dadbeac3c56e0b1b7ebc2ae4a
Author: kstange at pidgin.im
Date: 2008-12-06T19:57:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/665a07783e325291cdd356dacf8f394fb18f0031

Deleted entries:
        pidgin/pixmaps/protocols/16/facebook.png
        pidgin/pixmaps/protocols/22/facebook.png
        pidgin/pixmaps/protocols/48/facebook.png
Modified files:
        ChangeLog finch/gntaccount.c finch/gntroomlist.c
        finch/libgnt/gntentry.c libpurple/protocols/jabber/jabber.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/qq/ChangeLog
        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_opt.c
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/char_conv.h
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_im.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        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_define.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/qq/utils.h
        libpurple/protocols/yahoo/yahoo.c libpurple/proxy.c
        libpurple/prpl.h libpurple/roomlist.c libpurple/util.c
        pidgin/gtkaccount.c pidgin/gtkconv.c pidgin/gtkroomlist.c
        pidgin/gtkutils.c

ChangeLog: 

merge of '1203a733696f95eef53b04b5078e0a779371b4d3'
     and '5981a2262230950dadbeac3c56e0b1b7ebc2ae4a'