From 9db132bdcb30f7415254862e34cd6e1df2de8b4b Mon Sep 17 00:00:00 2001
From: mattr <mattr@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 4 Oct 2007 22:11:42 +0000
Subject: [PATCH] Fix bug 140366

Fix sending of <p> tags in unformatted Jabber messages.

Patch by Guillermo A. Amaral. Thanks!

CCMAIL: me@guillermoamaral.com
BUG: 140366


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@721284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kopete/protocols/jabber/jabberchatsession.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index 4dc0897d2..3b8821afb 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -21,6 +21,7 @@
 
 #include <qfile.h>
 #include <qicon.h>
+#include <qregexp.h>
 #include <config-kopete.h>
 
 #include <kconfig.h>
@@ -374,8 +375,10 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat
 					
 					//&nbsp; is not a valid XML entity
 					xhtmlBody.replace("&nbsp;" , "&#160;");
-							
-					xhtmlBody="<p "+ message.getHtmlStyleAttribute() +'>'+ xhtmlBody +"</p>";
+
+					//Remove trailing line break
+					xhtmlBody.remove(QRegExp("<br/>$"));
+					xhtmlBody="<span "+ message.getHtmlStyleAttribute() +'>'+ xhtmlBody +"</span>";
 					
 					QDomDocument doc;
 					doc.setContent(xhtmlBody, true);
-- 
2.11.4.GIT