pidgin: 016d96cd: merge of '48c771eeb88cbd5496d0886b95e8bb...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 016d96cd3d2c3e0c9966b9209bae225a8d3cb696
Ancestor: 48c771eeb88cbd5496d0886b95e8bbe1079d9f92
Ancestor: ea18c8ce78c0229a5b968aab268f38e9bcae0aee
Author: darkrain42 at pidgin.im
Date: 2009-12-31T18:03:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/016d96cd3d2c3e0c9966b9209bae225a8d3cb696

Modified files:
        finch/gntidle.c finch/gntrequest.c finch/gntstatus.c
        finch/libgnt/gntinternal.h finch/libgnt/gntline.c
        finch/libgnt/gntmenuitem.c finch/libgnt/gntmenuitemcheck.c
        finch/libgnt/gntprogressbar.c finch/libgnt/gntslider.c
        finch/libgnt/gntwidget.c finch/libgnt/gntwindow.c
        finch/libgnt/wms/irssi.c libpurple/media.h
        libpurple/protocols/mxit/splashscreen.c

ChangeLog: 

merge of '48c771eeb88cbd5496d0886b95e8bbe1079d9f92'
     and 'ea18c8ce78c0229a5b968aab268f38e9bcae0aee'