pidgin.next.minor: 586a914e: merge of '979e05e68e2d32cdffe65f350b71fd...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 586a914e39d5e3980aaf78c661660b38cd7d9538
Ancestor: 979e05e68e2d32cdffe65f350b71fd6e6ae89af9
Ancestor: df0ddcef268608879c9e3ecd095cb74903d279e8
Author: deryni at pidgin.im
Date: 2008-05-16T03:18:27
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/586a914e39d5e3980aaf78c661660b38cd7d9538

Added files:
        libpurple/plugins/perl/common/Smiley.xs libpurple/smiley.c
        libpurple/smiley.h pidgin/gtksmiley.c pidgin/gtksmiley.h
Modified files:
        COPYRIGHT ChangeLog.API libpurple/Makefile.am
        libpurple/Makefile.mingw libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/connection.h libpurple/core.c
        libpurple/dbus-analyze-functions.py libpurple/dbus-server.c
        libpurple/imgstore.c libpurple/imgstore.h
        libpurple/plugins/perl/Makefile.am
        libpurple/plugins/perl/common/MANIFEST
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/common/Purple.xs
        libpurple/plugins/perl/common/module.h
        libpurple/plugins/perl/common/typemap
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/dns_sd_proxy.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/win32/posix.uname.c
        libpurple/protocols/jabber/win32/utsname.h
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/httpconn.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/object.c
        libpurple/protocols/msn/object.h
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/object.h
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/oscar/peer_proxy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c libpurple/util.c
        libpurple/util.h pidgin/Makefile.am pidgin/Makefile.mingw
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c
        pidgin/gtkthemes.c pidgin/gtkthemes.h pidgin/gtkutils.c
        pidgin/gtkutils.h po/POTFILES.in

ChangeLog: 

merge of '979e05e68e2d32cdffe65f350b71fd6e6ae89af9'
     and 'df0ddcef268608879c9e3ecd095cb74903d279e8'