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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2013-05-30 22:26:41
Message-ID: 20130530222641.DFC15AC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1356492 by pali:

If jabber message is signed, set original text message to body


 M  +1 -1      jabberchatsession.cpp  
 M  +1 -1      jabbergroupchatmanager.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberchatsession.cpp #1356491:1356492
@@ -409,7 +409,7 @@
 			if ( xsigned && xencrypted )
 				jabberMessage.setBody ( "This message is signed and encrypted." );
 			else if ( xsigned )
-				jabberMessage.setBody ( "This message is signed." );
+				jabberMessage.setBody ( message.plainBody().trimmed() );
 			else if ( xencrypted )
 				jabberMessage.setBody ( "This message is encrypted." );
 			else
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbergroupchatmanager.cpp #1356491:1356492
@@ -119,7 +119,7 @@
 			if ( xsigned && xencrypted )
 				jabberMessage.setBody ( "This message is signed and encrypted." );
 			else if ( xsigned )
-				jabberMessage.setBody ( "This message is signed." );
+				jabberMessage.setBody ( message.plainBody().trimmed() );
 			else if ( xencrypted )
 				jabberMessage.setBody ( "This message is encrypted." );
 			else
[prev in list] [next in list] [prev in thread] [next in thread]