pidgin: ecded041: merge of '2f74488ded7cd1eab2d144578340b6...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ecded04145b1adc6b1f6b773b68bcef7eb1daf02
Ancestor: 2f74488ded7cd1eab2d144578340b6d13f570b7a
Ancestor: 3cb7456ced922a751171f95e0ab55d0beef7d1ec
Author: qulogic at pidgin.im
Date: 2009-04-10T07:31:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ecded04145b1adc6b1f6b773b68bcef7eb1daf02

Deleted entries:
        libpurple/protocols/toc
Modified files:
        ChangeLog ChangeLog.API configure.ac finch/gntmedia.c
        finch/libgnt/gnttree.c libpurple/account.c libpurple/blist.c
        libpurple/blist.h libpurple/buddyicon.c
        libpurple/conversation.c libpurple/core.c libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/plugin.c
        libpurple/plugin.h libpurple/plugins/filectl.c
        libpurple/plugins/joinpart.c libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
        libpurple/prpl.h libpurple/win32/win32dep.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdebug.c
        pidgin/gtkmedia.c pidgin/gtkmedia.h pidgin/gtkplugin.c
        pidgin/gtksound.c pidgin/gtkstatusbox.c pidgin/gtkutils.c
        pidgin/pidginstock.c pidgin/plugins/cap/cap.c
        pidgin/plugins/mailchk.c
        pidgin/plugins/musicmessaging/musicmessaging.c

ChangeLog: 

merge of '2f74488ded7cd1eab2d144578340b6d13f570b7a'
     and '3cb7456ced922a751171f95e0ab55d0beef7d1ec'