pidgin: 526c6b90: merge of '580055bb22fea0076d3a90d9df9346...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 526c6b9002e19ef77ccf9723d0dd04a2d9287ec5
Ancestor: 580055bb22fea0076d3a90d9df9346abd1789bab
Ancestor: fade006b4836b4f79bfcbf8d5be330408eda6273
Author: malu at pidgin.im
Date: 2009-04-17T21:29:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/526c6b9002e19ef77ccf9723d0dd04a2d9287ec5

Deleted entries:
        libpurple/protocols/toc
Added files:
        finch/libgnt/gntprogressbar.c finch/libgnt/gntprogressbar.h
        finch/plugins/gnttinyurl.c
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        finch/gntaccount.c finch/gntconv.c finch/gntmedia.c
        finch/libgnt/Makefile.am finch/libgnt/gnttextview.c
        finch/libgnt/gnttree.c finch/plugins/Makefile.am
        libpurple/Makefile.am libpurple/Makefile.mingw
        libpurple/account.c libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c libpurple/ft.c
        libpurple/internal.h libpurple/media.c libpurple/media.h
        libpurple/mediamanager.c libpurple/mediamanager.h
        libpurple/mime.c libpurple/mime.h libpurple/network.c
        libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/filectl.c libpurple/plugins/joinpart.c
        libpurple/protocols/bonjour/jabber.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/jabber/message.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.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/yahoo/yahoo_filexfer.c
        libpurple/protocols/zephyr/ZVariables.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
        libpurple/prpl.h libpurple/server.c libpurple/stun.c
        libpurple/theme-manager.c libpurple/win32/win32dep.c
        pidgin/eggtrayicon.h pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme.c pidgin/gtkblist-theme.h
        pidgin/gtkblist.c pidgin/gtkcellrendererexpander.c
        pidgin/gtkcellrendererexpander.h
        pidgin/gtkcellrendererprogress.h pidgin/gtkconv.c
        pidgin/gtkdebug.c pidgin/gtkdnd-hints.h pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtkimhtmltoolbar.h
        pidgin/gtkmain.c pidgin/gtkmedia.c pidgin/gtkmedia.h
        pidgin/gtkmenutray.c pidgin/gtkmenutray.h pidgin/gtkplugin.c
        pidgin/gtksound.c pidgin/gtksourceiter.h
        pidgin/gtksourceundomanager.h pidgin/gtkstatusbox.c
        pidgin/gtkstatusbox.h pidgin/gtkutils.c pidgin/minidialog.c
        pidgin/minidialog.h pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/plugins/cap/cap.c
        pidgin/plugins/mailchk.c
        pidgin/plugins/musicmessaging/musicmessaging.c
        pidgin/plugins/ticker/gtkticker.h po/POTFILES.in

ChangeLog: 

merge of '580055bb22fea0076d3a90d9df9346abd1789bab'
     and 'fade006b4836b4f79bfcbf8d5be330408eda6273'