pidgin: 22d261d1: merge of '0f3cc5eaf6cb9aff180d63efb1dee8...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 22d261d19f56b8cec771b7511f11dbbc367568fc
Ancestor: 0f3cc5eaf6cb9aff180d63efb1dee828936078d1
Ancestor: f917b4632a54553364f64ef2a02dfc4a6e015ea7
Author: maiku at soc.pidgin.im
Date: 2009-04-06T02:07:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/22d261d19f56b8cec771b7511f11dbbc367568fc

Modified files:
        COPYRIGHT ChangeLog configure.ac doc/finch.1.in
        finch/gntblist.c finch/gntmedia.c finch/libgnt/gnt.h
        finch/libgnt/gntbox.c finch/libgnt/gntcheckbox.c
        finch/libgnt/gntcombobox.c finch/libgnt/gntentry.c
        finch/libgnt/gnttextview.c finch/libgnt/gnttree.c
        finch/libgnt/gntwm.c finch/plugins/gntgf.c
        libpurple/media-gst.h libpurple/media.h
        libpurple/mediamanager.h
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/iq.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/content.h
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rawudp.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/jingle/transport.h
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/oob.h
        libpurple/protocols/jabber/parser.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/roster.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/jabber/usernick.h
        libpurple/protocols/jabber/usertune.h
        libpurple/protocols/jabber/xdata.h libpurple/util.h
        libpurple/xmlnode.h pidgin/gtkimhtml.c pidgin/gtkmedia.c
        pidgin/gtkprefs.h po/POTFILES.in

ChangeLog: 

merge of '0f3cc5eaf6cb9aff180d63efb1dee828936078d1'
     and 'f917b4632a54553364f64ef2a02dfc4a6e015ea7'