pidgin: 73a88ac8: merge of '1ce56b5da0a32c13c50761b20f87a3...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 73a88ac85b97264c19b9a9966270eecd310b6bff
Ancestor: 1ce56b5da0a32c13c50761b20f87a319cc55306f
Ancestor: 634c9cc535f126dc9579bb5f790e77356d55261a
Author: khc at pidgin.im
Date: 2009-07-21T04:25:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/73a88ac85b97264c19b9a9966270eecd310b6bff

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 ChangeLog.API libpurple/Makefile.am
        libpurple/dnsquery.c libpurple/dnssrv.c libpurple/network.c
        libpurple/network.h libpurple/plugins/Makefile.am
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/yahoo/libymsg.c libpurple/util.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
        pidgin/plugins/Makefile.am pidgin.desktop.in 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 '1ce56b5da0a32c13c50761b20f87a319cc55306f'
     and '634c9cc535f126dc9579bb5f790e77356d55261a'