pidgin: e77dc2d1: merge of 'ba3f5db0711c5a3b7c5b5510df2e5e...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: e77dc2d1f8199cca004d39b2e703583fa1667bcd
Ancestor: ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3
Ancestor: dab5669243bb3c1e57f6a22b430a4804cb65e582
Author: datallah at pidgin.im
Date: 2008-06-14T00:59:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e77dc2d1f8199cca004d39b2e703583fa1667bcd

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h pidgin/gtkconv.c
        pidgin/gtkutils.c

ChangeLog: 

merge of 'ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3'
     and 'dab5669243bb3c1e57f6a22b430a4804cb65e582'