pidgin: d6916843: merge of '6b6139039fdaaf6ab1059337085b3b...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: d69168431bf7501c4db03c757fc31f5be1dcbd10
Ancestor: 6b6139039fdaaf6ab1059337085b3b6267bb474e
Ancestor: 8eea4c055964a321a6a8f0403d8b27dcd8f0d041
Author: markdoliner at pidgin.im
Date: 2008-08-17T19:15:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d69168431bf7501c4db03c757fc31f5be1dcbd10

Modified files:
        libpurple/accountopt.h libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h pidgin/gtkconv.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
        pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg

ChangeLog: 

merge of '6b6139039fdaaf6ab1059337085b3b6267bb474e'
     and '8eea4c055964a321a6a8f0403d8b27dcd8f0d041'