xmpp.custom_smiley: 110555eb: propagate from branch 'im.pidgin.pidgin'...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 110555eba89887adcf842166213ffc82770c0ee4
Ancestor: 7be65dacd56b6536cf745747e39a29f4f7f2644b
Ancestor: a21aa16c365d48c3255358530932190b7263cc9d
Author: rlaager at pidgin.im
Date: 2008-06-11T15:20:16
Branch: im.pidgin.xmpp.custom_smiley
URL: http://d.pidgin.im/viewmtn/revision/info/110555eba89887adcf842166213ffc82770c0ee4

Added files:
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        pidgin/pixmaps/toolbar/16/transfer.png
Modified files:
        ChangeLog configure.ac doc/gtkrc-2.0 finch/gntblist.c
        finch/gntconv.c finch/gntft.c finch/gntlog.c
        finch/libgnt/gntcolors.c finch/libgnt/gntcolors.h
        finch/libgnt/gntentry.c finch/libgnt/gntmenu.c
        finch/libgnt/gnttree.c libpurple/Makefile.am
        libpurple/certificate.c libpurple/cmds.h
        libpurple/conversation.c libpurple/log.c
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/ssl/ssl-gnutls.c libpurple/privacy.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/object.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_advert.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_invite.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_popup.c
        libpurple/protocols/oscar/family_stats.c
        libpurple/protocols/oscar/family_translate.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/proxy.c
        libpurple/proxy.h libpurple/server.c
        libpurple/win32/global.mak pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkft.c
        pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c
        pidgin/pidginstock.c pidgin/pidginstock.h
        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/chat.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/16/person.png
        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/offline.svg
        pidgin/pixmaps/status/16/scalable/person.svg
        pidgin/pixmaps/toolbar/16/send-file.png
        pidgin/plugins/Makefile.mingw pidgin/plugins/spellchk.c
        pidgin/win32/nsis/pidgin-installer.nsi po/de.po po/en_AU.po
        po/lt.po share/ca-certs/Makefile.am
        share/ca-certs/Makefile.mingw
Modified attrs:
        pidgin/pixmaps/toolbar/16/transfer.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 7be65dacd56b6536cf745747e39a29f4f7f2644b)
            to branch 'im.pidgin.xmpp.custom_smiley' (head a21aa16c365d48c3255358530932190b7263cc9d)