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

List:       kde-commits
Subject:    kdenonbeta/kopete/libkopete
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2002-12-07 9:18:33
[Download RAW message or body]

CVS commit by ogoffart: 

Patch by Paul Grace to not display emoticons in links
Thanks


  M +8 -6      kopeteemoticons.cpp   1.19


--- kdenonbeta/kopete/libkopete/kopeteemoticons.cpp:1.18	Fri Nov 29 17:02:07 2002
@@ -216,18 +216,20 @@
 	{
 		QString em = QStyleSheet::escape( QString(*it).replace(QRegExp(";") , "\\;") );
 
-#if (QT_VERSION-0 >= 0x030100)
-		message.replace( em, "<img src=\"" +
-			KopeteEmoticons::emoticons()->emoticonToPicPath(*it) + "\">" );
-#else
 		int p=0;
-		while ( (p = message.find(em,0,true)) != -1 )
+		while ( (p = message.find(em,p,true)) != -1 )
 		{
+			if( (message.find( "/a>", p, false ) < message.find( "<a", p, false )) ||
+					(message.find( "/a>", p, false) && message.find( "<a", p, false) == -1) )
+			{
+				p++;
+				continue;
+			}
+			
 			message = message.remove( p, em.length() );
 			message = message.insert( p, "<img src=\"" +
 				KopeteEmoticons::emoticons()->emoticonToPicPath(*it) + "\">" );
 		}
-#endif
 	}
 
 	message.replace(QRegExp("\\\\;") , ";");

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