pidgin: f2b7278d: merge of 'a89c814a0c81eeacde296ce6a2520f...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: f2b7278d2cdd1762c9c41b42a85592596bacdeb1
Ancestor: a89c814a0c81eeacde296ce6a2520f1bac083ba4
Ancestor: b15f3e0335356e294b5b83fd8ad94b8f10cf76c2
Author: rlaager at pidgin.im
Date: 2009-08-22T23:42:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f2b7278d2cdd1762c9c41b42a85592596bacdeb1

Renamed entries:
        pidgin/pixmaps/toolbar/22/scalable/voice-call.svg to pidgin/pixmaps/toolbar/22/scalable/audio-call.svg
        pidgin/pixmaps/toolbar/22/voice-call.png to pidgin/pixmaps/toolbar/22/audio-call.png
        pidgin/pixmaps/toolbar/32/scalable/voice-call.svg to pidgin/pixmaps/toolbar/32/scalable/audio-call.svg
        pidgin/pixmaps/toolbar/32/voice-call.png to pidgin/pixmaps/toolbar/32/audio-call.png
        pidgin/pixmaps/toolbar/48/scalable/voice-call.svg to pidgin/pixmaps/toolbar/48/scalable/audio-call.svg
        pidgin/pixmaps/toolbar/48/voice-call.png to pidgin/pixmaps/toolbar/48/audio-call.png
Added files:
        pidgin/plugins/vvconfig.c
Modified files:
        COPYRIGHT ChangeLog PLUGIN_HOWTO configure.ac
        finch/plugins/grouping.c libpurple/certificate.c
        libpurple/dnssrv.c libpurple/media-gst.h libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.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/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.c
        libpurple/protocols/jabber/jingle/content.h
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/rawudp.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/jingle/transport.c
        libpurple/protocols/jabber/jingle/transport.h
        libpurple/protocols/jabber/jutil.c
        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.c
        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/useravatar.c
        libpurple/protocols/jabber/useravatar.h
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usernick.h
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/jabber/usertune.h
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/jabber/xdata.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/slp.c libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_crypt.h
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_yahoo_util.c pidgin/gtkblist-theme.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkmedia.c
        pidgin/gtkmedia.h pidgin/gtknotify.c
        pidgin/pixmaps/Makefile.am pidgin/plugins/Makefile.am
        pidgin/plugins/disco/gtkdisco.c po/hu.po

ChangeLog: 

merge of 'a89c814a0c81eeacde296ce6a2520f1bac083ba4'
     and 'b15f3e0335356e294b5b83fd8ad94b8f10cf76c2'