plugins:

	new_gpg:
		version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@16754 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 6 insertions, 2 deletions

diff --git a/plugins/New_GPG/src/Version.h b/plugins/New_GPG/src/Version.h
index 9ac1a71831..a983223f84 100755
--- a/plugins/New_GPG/src/Version.h
+++ b/plugins/New_GPG/src/Version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0

 #define __MINOR_VERSION          0

 #define __RELEASE_NUM            0

-#define __BUILD_NUM             12

+#define __BUILD_NUM             13

 

 #include <stdver.h>

 

diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index e1cf4ba1aa..eb54f53fb2 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -81,7 +81,7 @@ void RecvMsgSvc_func(MCONTACT hContact, std::wstring str, char *msg, DWORD, DWOR
 					boost::filesystem::remove(path, e);
 				}
 
-				{

+				{
 					const int timeout = 5000, step = 100;
 					int count = 0;
 
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index e066c585dc..f45c994602 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -650,6 +650,8 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void*)
 					return FALSE;
 		}
 		if (str) {
+
+			//TODO: make following block more readable
 			if (_tcsstr(str, _T("-----BEGIN PGP MESSAGE-----")) && _tcsstr(str, _T("-----END PGP MESSAGE-----"))) {
 				wstring data = str;
 				xmlSetText(local_node, _T("This message is encrypted."));
@@ -670,6 +672,8 @@ static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void*)
 				wstring::size_type p2 = data.find(_T("-----END PGP MESSAGE-----"));
 				wstring data2 = data.substr(p1, p2 - p1 - 2);
 				strip_line_term(data2);
+				if(bDebugLog)
+					debuglog<<std::string(time_str() + ": jabber_api: attaching:\r\n\r\n" + toUTF8(data2) + "\n\n\t to outgoing xml");
 				HXML encrypted_data = xmlAddChild(node, _T("x"), data2.c_str());
 				xmlAddAttr(encrypted_data, _T("xmlns"), _T("jabber:x:encrypted"));
 				return FALSE;