pidgin: b3930a14: merge of '212ddad0deea54f08e3194c79d2a60...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: b3930a1430bfa8b0e784f0337ba5374066f6fc52
Ancestor: 212ddad0deea54f08e3194c79d2a60584f60d855
Ancestor: 8ca6a80e2cd7fbbc59983f8ba370f7276e062db9
Author: sadrul at pidgin.im
Date: 2008-03-15T19:39:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b3930a1430bfa8b0e784f0337ba5374066f6fc52

Modified files:
        libpurple/imgstore.c libpurple/imgstore.h
        libpurple/protocols/myspace/myspace.c pidgin/gtkconv.c

ChangeLog: 

merge of '212ddad0deea54f08e3194c79d2a60584f60d855'
     and '8ca6a80e2cd7fbbc59983f8ba370f7276e062db9'