pidgin.next.minor: c126b299: merge of '064d2d1b2f96be3cfdc5d15af37aaa...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: c126b299b6ed60ee434d905a37b1901ce9572af3
Ancestor: 064d2d1b2f96be3cfdc5d15af37aaa8e16150904
Ancestor: f3a92f1db9439e0bedbcfc479c179d0bf4047b72
Author: qulogic at pidgin.im
Date: 2010-02-16T00:50:34
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/c126b299b6ed60ee434d905a37b1901ce9572af3

Renamed entries:
        pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connecting.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-extended-away.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-message.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-new-im.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-online.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-available.png
        pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connecting.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-extended-away.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-message.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-new-im.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-online.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-available.png
        pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connecting.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-extended-away.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-message.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-new-im.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-online.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-available.png
        pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connecting.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-extended-away.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-message.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-new-im.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-online.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-available.png
Modified files:
        libpurple/network.c pidgin/gtkdocklet-gtk.c
        pidgin/gtkdocklet-x11.c pidgin/gtkimhtml.c
        pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/Makefile.am po/ChangeLog po/he.po

ChangeLog: 

merge of '064d2d1b2f96be3cfdc5d15af37aaa8e16150904'
     and 'f3a92f1db9439e0bedbcfc479c179d0bf4047b72'