pidgin: b4330cb0: merge of '50e2f2c66f304a73c2a9ef4d912be5...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: b4330cb0af1a74cd8826d08447a38a366f1be3fc
Ancestor: 50e2f2c66f304a73c2a9ef4d912be5e3f2ed39a5
Ancestor: 73a88ac85b97264c19b9a9966270eecd310b6bff
Author: qulogic at pidgin.im
Date: 2009-07-21T06:16:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b4330cb0af1a74cd8826d08447a38a366f1be3fc

Deleted entries:
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable
Renamed entries:
        pidgin/pixmaps/dialogs/64/scalable to pidgin/pixmaps/dialogs/scalable
        pidgin/pixmaps/emblems/16/scalable to pidgin/pixmaps/emblems/scalable
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg to pidgin/pixmaps/icons/hicolor/scalable/apps/pidgin.svg
        pidgin/pixmaps/logo.png to pidgin/pixmaps/logo-nonvv.png
        pidgin/pixmaps/protocols/48/scalable to pidgin/pixmaps/protocols/scalable
Added files:
        pidgin/pixmaps/logo.png pidgin/pixmaps/logo.svg
        pidgin/pixmaps/status/svg/status.svg
        pidgin/pixmaps/toolbar/22/scalable/video-call.svg
        pidgin/pixmaps/toolbar/22/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/22/video-call.png
        pidgin/pixmaps/toolbar/22/voice-call.png
        pidgin/pixmaps/toolbar/32/scalable/video-call.svg
        pidgin/pixmaps/toolbar/32/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/32/video-call.png
        pidgin/pixmaps/toolbar/32/voice-call.png
        pidgin/pixmaps/toolbar/48/scalable/video-call.svg
        pidgin/pixmaps/toolbar/48/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/48/video-call.png
        pidgin/pixmaps/toolbar/48/voice-call.png
Added directories:
        pidgin/pixmaps/icons/hicolor/scalable
        pidgin/pixmaps/icons/hicolor/scalable/apps
        pidgin/pixmaps/toolbar/32 pidgin/pixmaps/toolbar/32/scalable
        pidgin/pixmaps/toolbar/48 pidgin/pixmaps/toolbar/48/scalable
Modified files:
        ChangeLog libpurple/dnsquery.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/yahoo/libymsg.c pidgin/gtkblist.c
        pidgin/pidginstock.c pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/status/16/available.png
        pidgin/pixmaps/status/16/away.png
        pidgin/pixmaps/status/16/busy.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/22/available.png
        pidgin/pixmaps/status/22/away.png
        pidgin/pixmaps/status/22/busy.png
        pidgin/pixmaps/status/22/offline.png
        pidgin/pixmaps/status/32/available.png
        pidgin/pixmaps/status/32/away.png
        pidgin/pixmaps/status/32/busy.png
        pidgin/pixmaps/status/32/offline.png
        pidgin/pixmaps/status/48/available.png
        pidgin/pixmaps/status/48/away.png
        pidgin/pixmaps/status/48/busy.png
        pidgin/pixmaps/status/48/offline.png po/ChangeLog po/km.po
        po/nl.po po/pt_BR.po
Modified attrs:
        pidgin/pixmaps/logo.png
        pidgin/pixmaps/toolbar/22/video-call.png
        pidgin/pixmaps/toolbar/22/voice-call.png
        pidgin/pixmaps/toolbar/32/video-call.png
        pidgin/pixmaps/toolbar/32/voice-call.png
        pidgin/pixmaps/toolbar/48/video-call.png
        pidgin/pixmaps/toolbar/48/voice-call.png

ChangeLog: 

merge of '50e2f2c66f304a73c2a9ef4d912be5e3f2ed39a5'
     and '73a88ac85b97264c19b9a9966270eecd310b6bff'