Attachment #117992 for bug #164115

View | Details | Raw Unified | Return to bug 164115
Collapse All | Expand All

Lines 184-190 Link Here

(-)kopete-3.5.6.orig/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp (-1 / +1 lines)
184	}	184	}
185	else	185	else
186	{	186	{
187	kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << " - not a valid YMSG packet. Trying to recover." << endl;	187	kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << " - not a valid YMSG packet. Trying to recover." << wire << endl;
188	QTextStream s( wire, IO_ReadOnly );	188	QTextStream s( wire, IO_ReadOnly );
189	QString remaining = s.read();	189	QString remaining = s.read();
190	int pos = remaining.find( "YMSG", bytesParsed );	190	int pos = remaining.find( "YMSG", bytesParsed );




	QString raw;
	m_list.append( t->firstParam( 87 ) );

	if( t->firstParam( 59 ).isEmpty() )
		return;

	QStringList groups;
	groups = QStringList::split( "\n", m_list );

	for ( QStringList::Iterator groupIt = groups.begin(); groupIt != groups.end(); ++groupIt ) 
	{

			emit gotBuddy( *buddyIt, QString::null, group );
		}
	}
	m_list.truncate( 0 );
}

void ListTask::parseStealthList( YMSGTransfer *t )

Lines 41-46 Link Here

(-)kopete-3.5.6.orig/kopete/protocols/yahoo/libkyahoo/listtask.h (+3 lines)
41	signals:	41	signals:
42	void gotBuddy(const QString&, const QString&, const QString&);	42	void gotBuddy(const QString&, const QString&, const QString&);
43	void stealthStatusChanged( const QString&, Yahoo::StealthStatus );	43	void stealthStatusChanged( const QString&, Yahoo::StealthStatus );
		44	private:
		45	QString m_list;
		46
44	};	47	};
45		48
46	#endif	49	#endif




			if (accept)
				value[x++] = data[pos++];
		}
		if (accept) {
			value[x] = 0;
			pos += 2;
		}

		if (accept) 
		{

	}

	// Packets consisting of several YMSG-packets sometimes contain padding chars (0x00) -> filter out
	while( (BYTE)data[pos] == (BYTE) 0x00 && pos <= len + 20)
		pos++;


	kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << " Returning transfer" << endl;
	// tell them we have parsed offset bytes

Return to bug 164115

Lines 69-81 Link Here

(-)kopete-3.5.6.orig/kopete/protocols/yahoo/libkyahoo/listtask.cpp (-3 / +5 lines)
69	QString raw;	69	QString raw;
70	raw = t->firstParam( 87 );	70	m_list.append( t->firstParam( 87 ) );
71	if( raw.isEmpty() )	71
		72	if( t->firstParam( 59 ).isEmpty() )
72	return;	73	return;
73		74
74	QStringList groups;	75	QStringList groups;
75	groups = QStringList::split( "\n", raw );	76	groups = QStringList::split( "\n", m_list );
76		77
77	for ( QStringList::Iterator groupIt = groups.begin(); groupIt != groups.end(); ++groupIt )	78	for ( QStringList::Iterator groupIt = groups.begin(); groupIt != groups.end(); ++groupIt )
78	{	79	{
Lines 88-93 Link Here
88	emit gotBuddy( *buddyIt, QString::null, group );	89	emit gotBuddy( *buddyIt, QString::null, group );
89	}	90	}
90	}	91	}
		92	m_list.truncate( 0 );
91	}	93	}
92		94
93	void ListTask::parseStealthList( YMSGTransfer *t )	95	void ListTask::parseStealthList( YMSGTransfer *t )

Lines 357-365 Link Here

(-)kopete-3.5.6.orig/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp (-4 / +6 lines)
357	if (accept)	357	if (accept)
358	value[x++] = data[pos++];	358	value[x++] = data[pos++];
359	}	359	}
360	if (accept)	360	if (accept) {
361	value[x] = 0;	361	value[x] = 0;
362	pos += 2;	362	pos += 2;
		363	}
363		364
364	if (accept)	365	if (accept)
365	{	366	{
Lines 375-382 Link Here
375	}	376	}
376		377
377	// Packets consisting of several YMSG-packets sometimes contain padding chars (0x00) -> filter out	378	// Packets consisting of several YMSG-packets sometimes contain padding chars (0x00) -> filter out
378	while( (BYTE)data[pos] == (BYTE) 0x00 && pos <= len + 20)	379	while( (BYTE)data[pos] == (BYTE) 0x00 && pos <= len + 20)
379	pos++;	380	pos++;
		381
380		382
381	kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << " Returning transfer" << endl;	383	kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << " Returning transfer" << endl;
382	// tell them we have parsed offset bytes	384	// tell them we have parsed offset bytes