soc.2009.webkitmessageview: 04005a46: merge of '2892be2675013db56566e8db49e1e9...

[tdrhq at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 04005a4683481769ce378ba3ec53893d7a9a7fc7
Ancestor: 2892be2675013db56566e8db49e1e9cd1dd2c079
Ancestor: afac9e1953739f4439b9907dcc941bf5ef457d7f
Author: tdrhq at soc.pidgin.im
Date: 2009-08-07T18:27:52
Branch: im.pidgin.soc.2009.webkitmessageview
URL: http://d.pidgin.im/viewmtn/revision/info/04005a4683481769ce378ba3ec53893d7a9a7fc7

Deleted entries:
        pidgin/pixmaps/status/11/invisible.png
        pidgin/pixmaps/status/16/invisible.png
        pidgin/pixmaps/status/22/invisible.png
        pidgin/pixmaps/status/32/invisible.png
        pidgin/pixmaps/status/48/invisible.png
Renamed entries:
        pidgin/pixmaps/status/11/offline.png to pidgin/pixmaps/status/11/invisible.png
        pidgin/pixmaps/status/16/offline.png to pidgin/pixmaps/status/16/invisible.png
        pidgin/pixmaps/status/22/offline.png to pidgin/pixmaps/status/22/invisible.png
        pidgin/pixmaps/status/32/offline.png to pidgin/pixmaps/status/32/invisible.png
        pidgin/pixmaps/status/48/offline.png to pidgin/pixmaps/status/48/invisible.png
Added files:
        libpurple/tests/test_yahoo_util.c libpurple/valgrind.h
        pidgin/gtkwebview.c pidgin/gtkwebview.h
        pidgin/pixmaps/status/11/offline.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/22/offline.png
        pidgin/pixmaps/status/32/offline.png
        pidgin/pixmaps/status/48/offline.png
        share/ca-certs/Thawte_Premium_Server_CA.pem
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API Makefile.mingw
        libpurple/Makefile.am libpurple/account.c
        libpurple/accountopt.c libpurple/blist.c libpurple/blist.h
        libpurple/certificate.c libpurple/conversation.c
        libpurple/ft.c libpurple/media.c libpurple/network.h
        libpurple/plugin.c libpurple/privacy.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/zephyr/ZVariables.c
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c libpurple/tests/tests.h
        libpurple/win32/global.mak libpurple/win32/targets.mak
        pidgin/gtkft.c pidgin/gtkmedia.c pidgin/plugins/cap/cap.c
        pidgin/plugins/themeedit-icon.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/af.po
        po/ca at valencia.po po/de.po po/he.po po/hu.po po/lt.po
        po/sk.po po/sv.po share/ca-certs/Makefile.am
Modified attrs:
        pidgin/pixmaps/status/11/offline.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/22/offline.png
        pidgin/pixmaps/status/32/offline.png
        pidgin/pixmaps/status/48/offline.png

ChangeLog: 

merge of '2892be2675013db56566e8db49e1e9cd1dd2c079'
     and 'afac9e1953739f4439b9907dcc941bf5ef457d7f'