[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    groupwise_in_anger: kdenetwork/kopete/protocols/groupwise/libgroupwise
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2004-09-10 11:47:29
Message-ID: 20040910114729.DBABB1D90 () office ! kde ! org
[Download RAW message or body]

CVS commit by wstephens: 

Second part of the Qt < 3.3.2 fromUtf8 fix. Qt 3.3.1 users will be able to receive \
messages now.


  M +2 -2      inputprotocolbase.cpp   1.1.2.6
  M +1 -1      response.cpp   1.1.2.5


--- kdenetwork/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp  \
#1.1.2.5:1.1.2.6 @@ -42,5 +42,5 @@ bool InputProtocolBase::readString( QStr
         if ( !safeReadBytes( rawData, len ) )
                 return false;
-        message = QString::fromUtf8( rawData.data(), len );
+        message = QString::fromUtf8( rawData.data(), len - 1 );
         return true;
 }
@@ -85,5 +85,5 @@ bool InputProtocolBase::safeReadBytes( Q
                 // this caused a crash - guessing that temp.length() is set to the \
                number of bytes actually read...
                 // if ( (Q_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == \
                0xFF )
-                if ( temp.length() < ( val -1 ) )
+                if ( temp.length() < ( val - 1 ) )
                 {
                         qDebug( "InputProtocol::safeReadBytes() - string broke, \
giving up, only got: %i bytes out of %i",  temp.length(), val );


[prev in list] [next in list] [prev in thread] [next in thread]