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

List:       kde-commits
Subject:    branches/KDE/4.2/kdenetwork/kopete/libkopete
From:       Roman Jarosz <kedgedev () centrum ! cz>
Date:       2009-01-09 22:36:17
Message-ID: 1231540577.745339.6012.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 908570 by rjarosz:

Backport SVN commit 908528.

Fix richtext override option.



 M  +7 -2      kopetemessage.cpp  


--- branches/KDE/4.2/kdenetwork/kopete/libkopete/kopetemessage.cpp #908569:908570
@@ -210,7 +210,12 @@
 
 void Message::setRichTextOverride( bool enabled )
 {
-	d->richTextOverride = enabled;
+	if ( d->richTextOverride != enabled )
+	{
+		d->richTextOverride = enabled;
+		d->escapedBodyDirty = true;
+		d->parsedBodyDirty = true;
+	}
 }
 
 void Message::setForegroundColor( const QColor &color )
@@ -364,7 +369,7 @@
 		return d->escapedBody;
 	else {
 		QString html;
-		if ( d->format == Qt::PlainText )
+		if ( d->format == Qt::PlainText || d->richTextOverride )
 			html = Qt::convertFromPlainText( d->body->toPlainText(), Qt::WhiteSpaceNormal );
 		else
 			html = d->body->toHtml();
[prev in list] [next in list] [prev in thread] [next in thread]