soc.2008.masterpassword: edf6be62: propagate from branch 'im.pidgin.pidgin'...

[scrouaf at soc.pidgin.im]

-----------------------------------------------------------------
Revision: edf6be62a046a003a75458e4ce0807af9c2e9598
Ancestor: cb4568677518a721945328eca0cab9c071dd71b3
Ancestor: d38b0e23fda81858ef7fe68e99d088fa1e83f02b
Author: scrouaf at soc.pidgin.im
Date: 2008-08-15T03:41:24
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/edf6be62a046a003a75458e4ce0807af9c2e9598

Deleted entries:
        pidgin/pixmaps/emotes/default/24/sigarette.png
Renamed entries:
        pidgin/pixmaps/emotes/default/24/disapointed.png to pidgin/pixmaps/emotes/default/24/disappointed.png
        pidgin/pixmaps/emotes/default/24/scalable/disapointed.svg to pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
        pidgin/pixmaps/emotes/default/24/scalable/sigarette.svg to pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
Added files:
        libpurple/keyring.c libpurple/keyring.h
        libpurple/plugins/keyrings/Makefile.am
        libpurple/plugins/keyrings/gnomekeyring.c
        libpurple/plugins/keyrings/internalkeyring.c
        pidgin/pixmaps/emotes/default/24/cigarette.png
        pidgin/pixmaps/status/16/scalable/invisible.svg
        pidgin/pixmaps/tray/22/scalable/tray-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-busy.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
Added directories:
        libpurple/plugins/keyrings
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        finch/gntaccount.c finch/gntprefs.c libpurple/Makefile.am
        libpurple/account.c libpurple/account.h
        libpurple/connection.c libpurple/connection.h
        libpurple/conversation.c libpurple/core.c
        libpurple/eventloop.h libpurple/example/nullclient.c
        libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/Makefile.am
        libpurple/plugins/ssl/ssl-nss.c libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/page.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/silc.c libpurple/prpl.c
        libpurple/util.c libpurple/util.h libpurple/xmlnode.h
        pidgin/gtkaccount.c pidgin/gtkconv.c pidgin/gtkprefs.c
        pidgin/pidginstock.c
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/default/24/island.png
        pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
        pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
        pidgin/pixmaps/emotes/default/24/snail.png
        pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
        pidgin/pixmaps/logo.png
        pidgin/pixmaps/status/16/invisible.png
        pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/22/tray-away.png
        pidgin/pixmaps/tray/22/tray-busy.png
        pidgin/pixmaps/tray/22/tray-invisible.png
        pidgin/pixmaps/tray/22/tray-new-im.png
        pidgin/pixmaps/tray/22/tray-offline.png
        pidgin/pixmaps/tray/22/tray-online.png
        pidgin/win32/gtkwin32dep.c po/hu.po po/nl.po
Modified attrs:
        pidgin/pixmaps/emotes/default/24/cigarette.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head d38b0e23fda81858ef7fe68e99d088fa1e83f02b)
            to branch 'im.pidgin.soc.2008.masterpassword' (head cb4568677518a721945328eca0cab9c071dd71b3)