pidgin.vv.ticket34: 38af2205: propagate from branch 'im.pidgin.pidgin'...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 38af2205b36484547be80f9929fb059d25f74ff7
Ancestor: 49c87e1875454a84f007720923563cf82dc8862b
Ancestor: 86f8b3e5d789c691f873f515a92fe8e111dcab6e
Author: sadrul at pidgin.im
Date: 2008-03-22T04:56:03
Branch: im.pidgin.pidgin.vv.ticket34
URL: http://d.pidgin.im/viewmtn/revision/info/38af2205b36484547be80f9929fb059d25f74ff7

Added files:
        finch/gntmedia.c finch/gntmedia.h libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/protocols/jabber/jingle.c
        libpurple/protocols/jabber/jingle.h pidgin/gtkmedia.c
        pidgin/gtkmedia.h
Modified files:
        COPYRIGHT ChangeLog configure.ac finch/Makefile.am
        finch/gntaccount.c finch/gntdebug.c finch/gntft.c
        finch/gntlog.c finch/gntnotify.c finch/gntplugin.c
        finch/gntpounce.c finch/gntrequest.c finch/gntstatus.c
        finch/gntui.c finch/libgnt/Makefile.am
        finch/libgnt/gntkeys.h finch/libgnt/wms/Makefile.am
        finch/libgnt/wms/s.c finch/plugins/Makefile.am
        libpurple/Makefile.am libpurple/account.c
        libpurple/example/Makefile.am libpurple/nat-pmp.c
        libpurple/plugins/Makefile.am
        libpurple/plugins/perl/Makefile.am
        libpurple/plugins/ssl/Makefile.am
        libpurple/plugins/tcl/Makefile.am libpurple/plugins/test.pl
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/gg.c
        libpurple/protocols/irc/Makefile.am
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/Makefile.am
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/qq.c
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/Makefile.am
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/Makefile.am
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/prpl.h libpurple/server.c libpurple/server.h
        pidgin/Makefile.am pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkconv.h pidgin/gtkconvwin.h pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtkimhtmltoolbar.h
        pidgin/gtkprefs.c pidgin/gtkprefs.h pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/protocols/16/jabber.png
        pidgin/pixmaps/protocols/16/scalable/jabber.svg
        pidgin/pixmaps/protocols/22/jabber.png
        pidgin/pixmaps/protocols/22/scalable/jabber.svg
        pidgin/pixmaps/protocols/48/jabber.png
        pidgin/pixmaps/protocols/48/scalable/jabber.svg
        pidgin/plugins/Makefile.am pidgin/plugins/cap/Makefile.am
        pidgin/plugins/gestures/Makefile.am
        pidgin/plugins/gevolution/Makefile.am
        pidgin/plugins/musicmessaging/Makefile.am
        pidgin/plugins/ticker/Makefile.am pidgin/win32/winpidgin.c
        po/POTFILES.in po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 86f8b3e5d789c691f873f515a92fe8e111dcab6e)
            to branch 'im.pidgin.pidgin.vv.ticket34' (head 49c87e1875454a84f007720923563cf82dc8862b)