------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=121053         
mattr kde org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From mattr kde org  2006-02-26 17:50 -------
SVN commit 513828 by mattr:

workaround the trillian bug where they fail to correctly recognize type 2 
messages with UTF-8.

BUG: 121053



 M  +4 -23     icqcontact.cpp  


--- branches/kopete/0.12/kopete/protocols/oscar/icq/icqcontact.cpp 
#513827:513828
 @ -402,32 +402,13  @
 
        QTextCodec* codec = contactCodec();
 
-       int messageChannel;
+       int messageChannel = 0x01;
        Oscar::Message::Encoding messageEncoding;
 
-       if ( !isOnline() )
-       {
-               messageChannel = 0x01;
-               messageEncoding = Oscar::Message::UserDefined;
-       }
-       else if ( !m_details.hasCap( CAP_UTF8 ) )
-       {
-               if ( m_details.hasCap( CAP_ICQSERVERRELAY ) )
-                       messageChannel = 0x02;
-               else
-                       messageChannel = 0x01;
-               messageEncoding = Oscar::Message::UserDefined;
-       }
-       else if ( m_details.hasCap( CAP_ICQSERVERRELAY ) )
-       {
-               messageChannel = 0x02;
-               messageEncoding = Oscar::Message::UTF8;
-       }
-       else
-       {
-               messageChannel = 0x01;
+       if ( isOnline() && m_details.hasCap( CAP_UTF8 ) )
                messageEncoding = Oscar::Message::UCS2;
-       }
+       else
+               messageEncoding = Oscar::Message::UserDefined;
 
        QString msgText( msg.plainBody() );
        // TODO: More intelligent handling of message length.
_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel

Reply via email to