diff -X exclude -Nur psi-psz-src-2004.09.25/psi/src/userlist.cpp psi/psi/src/userlist.cpp --- psi-psz-src-2004.09.25/psi/src/userlist.cpp Sat Sep 25 15:22:02 2004 +++ psi/psi/src/userlist.cpp Tue Oct 5 21:33:48 2004 @@ -461,7 +461,7 @@ s = plain2rich(s); if ( doLinkify ) s = linkify(s); - if( option.useEmoticons && option.emoticonsInToolTip && !doLinkify ) + if( option.useEmoticons && option.emoticonsInToolTip /*&& !doLinkify */) s = emoticonify(s); str += QString("
%1
%2").arg(head).arg(s); } @@ -489,7 +489,7 @@ s = plain2rich(s); if ( doLinkify ) s = linkify(s); - if( option.useEmoticons ) + if( option.useEmoticons && option.emoticonsInToolTip ) s = emoticonify(s); str += QString("
%1
%2").arg(head).arg(s); }