pidgin: d9ebf57f: merge of '6a6409370fa50e23bc8fdedcef2302...

[xake at rymdraket.net]

-----------------------------------------------------------------
Revision: d9ebf57fb51742d0991c758dfe470c353fe3924f
Ancestor: 6a6409370fa50e23bc8fdedcef230220fa680a36
Ancestor: dd33cca1c5e6f5f7ea4cb392ed2954841617c1f1
Author: xake at rymdraket.net
Date: 2009-05-18T19:54:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d9ebf57fb51742d0991c758dfe470c353fe3924f

Deleted entries:
        libpurple/protocols/yahoo/yahoo_auth.c
        libpurple/protocols/yahoo/yahoo_auth.h
        libpurple/protocols/yahoo/yahoo_crypt.c
        libpurple/protocols/yahoo/yahoo_crypt.h
Modified files:
        .mtn-ignore COPYRIGHT ChangeLog ChangeLog.API Makefile.mingw
        configure.ac doc/blist-signals.dox libpurple/account.c
        libpurple/blist.c libpurple/blist.h libpurple/buddyicon.c
        libpurple/dbus-analyze-functions.py libpurple/dnsquery.c
        libpurple/mime.c libpurple/network.c
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/signals-test.c libpurple/prefs.c
        libpurple/protocols/irc/msgs.c
        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/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/iq.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/oob.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/Makefile.mingw
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/savedstatuses.c libpurple/upnp.c libpurple/util.c
        libpurple/util.h libpurple/win32/global.mak
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtknotify.c
        pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/win32/pidgin_dll_rc.rc.in
        pidgin/win32/pidgin_exe_rc.rc.in pidgin/win32/winpidgin.c
        po/ca.po po/de.po

ChangeLog: 

merge of '6a6409370fa50e23bc8fdedcef230220fa680a36'
     and 'dd33cca1c5e6f5f7ea4cb392ed2954841617c1f1'