pidgin: 4ca7deb6: merge of '23de00c9ca4c1e5f6d10ff40c78d26...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 4ca7deb6b5e18e3d1d4a66e79173977ae0e14609
Ancestor: 23de00c9ca4c1e5f6d10ff40c78d2647432260de
Ancestor: abcb63937b0282df910bc35d286c3f0d3245bfa5
Author: khc at pidgin.im
Date: 2008-08-27T02:41:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4ca7deb6b5e18e3d1d4a66e79173977ae0e14609

Deleted entries:
        pidgin/pixmaps/status/11/scalable
        pidgin/pixmaps/status/11/scalable/available.svg
        pidgin/pixmaps/status/11/scalable/away.svg
        pidgin/pixmaps/status/11/scalable/busy.svg
        pidgin/pixmaps/status/11/scalable/chat.svg
        pidgin/pixmaps/status/11/scalable/extended-away.svg
        pidgin/pixmaps/status/11/scalable/invisible.svg
        pidgin/pixmaps/status/11/scalable/offline.svg
        pidgin/pixmaps/status/11/scalable/person.svg
        pidgin/pixmaps/status/16/scalable
        pidgin/pixmaps/status/16/scalable/available.svg
        pidgin/pixmaps/status/16/scalable/away.svg
        pidgin/pixmaps/status/16/scalable/busy.svg
        pidgin/pixmaps/status/16/scalable/chat.svg
        pidgin/pixmaps/status/16/scalable/extended-away.svg
        pidgin/pixmaps/status/16/scalable/invisible.svg
        pidgin/pixmaps/status/16/scalable/log-in.svg
        pidgin/pixmaps/status/16/scalable/log-out.svg
        pidgin/pixmaps/status/16/scalable/message-pending.svg
        pidgin/pixmaps/status/16/scalable/offline.svg
        pidgin/pixmaps/status/16/scalable/person.svg
        pidgin/pixmaps/status/22/scalable
        pidgin/pixmaps/status/22/scalable/available.svg
        pidgin/pixmaps/status/22/scalable/away.svg
        pidgin/pixmaps/status/22/scalable/busy.svg
        pidgin/pixmaps/status/22/scalable/chat.svg
        pidgin/pixmaps/status/22/scalable/extended-away.svg
        pidgin/pixmaps/status/22/scalable/log-in.svg
        pidgin/pixmaps/status/22/scalable/log-out.svg
        pidgin/pixmaps/status/22/scalable/offline.svg
        pidgin/pixmaps/status/22/scalable/person.svg
        pidgin/pixmaps/status/22/scalable/sign-off.svg
        pidgin/pixmaps/status/22/scalable/sign-on.svg
        pidgin/pixmaps/status/32/scalable
        pidgin/pixmaps/status/32/scalable/available.svg
        pidgin/pixmaps/status/32/scalable/away.svg
        pidgin/pixmaps/status/32/scalable/busy.svg
        pidgin/pixmaps/status/32/scalable/chat.svg
        pidgin/pixmaps/status/32/scalable/extended-away.svg
        pidgin/pixmaps/status/32/scalable/log-in.svg
        pidgin/pixmaps/status/32/scalable/log-out.svg
        pidgin/pixmaps/status/32/scalable/offline.svg
        pidgin/pixmaps/status/32/scalable/person.svg
        pidgin/pixmaps/tray/16/scalable
        pidgin/pixmaps/tray/16/scalable/tray-away.svg
        pidgin/pixmaps/tray/16/scalable/tray-busy.svg
        pidgin/pixmaps/tray/16/scalable/tray-connecting.svg
        pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg
        pidgin/pixmaps/tray/16/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/16/scalable/tray-message.svg
        pidgin/pixmaps/tray/16/scalable/tray-offline.svg
        pidgin/pixmaps/tray/16/scalable/tray-online.svg
        pidgin/pixmaps/tray/22/scalable
        pidgin/pixmaps/tray/22/scalable/tray-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-busy.svg
        pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/22/scalable/tray-message-new.svg
        pidgin/pixmaps/tray/22/scalable/tray-offline.svg
        pidgin/pixmaps/tray/22/scalable/tray-online.svg
        pidgin/pixmaps/tray/32/scalable
        pidgin/pixmaps/tray/48/scalable
        share/ca-certs/Microsoft_Internet_Authority.pem
Added files:
        pidgin/pixmaps/status/svg/pidgin-status.svg
Added directories:
        pidgin/pixmaps/status/svg
Modified files:
        Makefile.am configure.ac libpurple/log.c
        libpurple/protocols/msn/user.c libpurple/proxy.c
        libpurple/util.c libpurple/win32/win32dep.c
        libpurple/win32/win32dep.h pidgin/gtksmiley.c
        pidgin/pidginstock.c pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/dialogs/64/question.png
        pidgin/pixmaps/dialogs/64/scalable/question.svg
        pidgin/pixmaps/status/11/chat.png
        pidgin/pixmaps/status/11/log-in.png
        pidgin/pixmaps/status/11/log-out.png
        pidgin/pixmaps/status/11/person.png po/de.po po/fr.po
        po/lt.po po/nl.po share/ca-certs/Makefile.am
        share/ca-certs/Microsoft_Secure_Server_Authority.pem

ChangeLog: 

merge of '23de00c9ca4c1e5f6d10ff40c78d2647432260de'
     and 'abcb63937b0282df910bc35d286c3f0d3245bfa5'