pidgin: 279952a5: merge of 'ac3524a1092f2874db1b7f443cd911...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 279952a5189f9f57a85d73e53794bc1fbcf86ae9
Ancestor: ac3524a1092f2874db1b7f443cd91144bbd8a3a4
Ancestor: bcb04d16f3ca4e36afd84bde4ebe44396dc6c2b3
Author: darkrain42 at pidgin.im
Date: 2009-04-26T02:18:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/279952a5189f9f57a85d73e53794bc1fbcf86ae9

Modified files:
        ChangeLog libpurple/blist.h libpurple/mediamanager.h
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/parser.h libpurple/smiley.h
        libpurple/sound-theme.h libpurple/theme-loader.h
        libpurple/theme-manager.h libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/gtkblist-theme.h
        pidgin/gtkicon-theme.h pidgin/gtkutils.c

ChangeLog: 

merge of 'ac3524a1092f2874db1b7f443cd91144bbd8a3a4'
     and 'bcb04d16f3ca4e36afd84bde4ebe44396dc6c2b3'