pidgin: c22d8241: merge of '1a20622e5eb611356f66565b96618a...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: c22d824152072143b7ba7eb8b365c97069c60761
Ancestor: 1a20622e5eb611356f66565b96618ab1cfe1e231
Ancestor: d993fb67df1d01ad9a8a18fef3e8a5de90823875
Author: rlaager at pidgin.im
Date: 2008-05-25T23:48:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c22d824152072143b7ba7eb8b365c97069c60761

Modified files:
        libpurple/plugins/perl/common/Smiley.xs libpurple/smiley.c
        libpurple/smiley.h pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtksmiley.c

ChangeLog: 

merge of '1a20622e5eb611356f66565b96618ab1cfe1e231'
     and 'd993fb67df1d01ad9a8a18fef3e8a5de90823875'