pidgin.custom_smiley: 4c843af7: propagate from branch 'im.pidgin.pidgin'...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 4c843af7ab59cd649466ff4da8c0770902749ec5
Ancestor: 8ab7bcf180c3d8cc09b9d82060417bcf3fcfff95
Ancestor: aeaf4e99a407c48978426a7866b921b380471dad
Author: sadrul at pidgin.im
Date: 2008-03-31T21:04:51
Branch: im.pidgin.pidgin.custom_smiley
URL: http://d.pidgin.im/viewmtn/revision/info/4c843af7ab59cd649466ff4da8c0770902749ec5

Added files:
        libpurple/smiley.c libpurple/smiley.h pidgin/gtksmiley.c
        pidgin/gtksmiley.h
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API Makefile.am NEWS
        autogen.sh configure.ac finch/libgnt/gntwm.c
        libpurple/Makefile.am libpurple/Makefile.mingw
        libpurple/account.c libpurple/certificate.c libpurple/core.c
        libpurple/imgstore.c libpurple/imgstore.h
        libpurple/internal.h libpurple/nat-pmp.c libpurple/network.c
        libpurple/plugins/test.pl
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/object.c
        libpurple/protocols/msn/object.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_status.c
        libpurple/protocols/qq/crypt.c
        libpurple/protocols/qq/crypt.h
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group_network.c
        libpurple/protocols/qq/im.c
        libpurple/protocols/qq/keep_alive.c
        libpurple/protocols/qq/login_logout.c
        libpurple/protocols/qq/recv_core.c
        libpurple/protocols/qq/send_core.c
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoochat.c libpurple/proxy.c
        libpurple/util.c libpurple/util.h
        libpurple/win32/libc_interface.c
        libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/win32dep.c
        libpurple/win32/win32dep.h pidgin/Makefile.am
        pidgin/Makefile.mingw pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c
        pidgin/gtkscrollbook.c pidgin/gtksession.c pidgin/gtksound.c
        pidgin/gtkthemes.c pidgin/gtkthemes.h pidgin/gtkutils.c
        pidgin/minidialog.c pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/buddy_icons/qq/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/none/Makefile.am
        pidgin/pixmaps/protocols/16/jabber.png
        pidgin/pixmaps/protocols/16/scalable/jabber.svg
        pidgin/pixmaps/protocols/22/jabber.png
        pidgin/pixmaps/protocols/22/scalable/jabber.svg
        pidgin/pixmaps/protocols/48/jabber.png
        pidgin/pixmaps/protocols/48/scalable/jabber.svg
        pidgin/win32/IdleTracker/idletrack.h
        pidgin/win32/gtkdocklet-win32.c pidgin/win32/untar.c
        pidgin/win32/untar.h pidgin/win32/winpidgin.c
        pidgin/win32/wspell.h po/ChangeLog po/POTFILES.in po/ar.po
        po/be at latin.po po/ca.po po/cs.po po/de.po po/eo.po po/es.po
        po/et.po po/fi.po po/fr.po po/he.po po/hu.po po/it.po
        po/mk.po po/nl.po po/nn.po po/ro.po po/ru.po po/sk.po
        po/sv.po po/zh_TW.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 8ab7bcf180c3d8cc09b9d82060417bcf3fcfff95)
            to branch 'im.pidgin.pidgin.custom_smiley' (head aeaf4e99a407c48978426a7866b921b380471dad)