From d43354bf06f8f1b404d5b26d35fe5e758da12ab1 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss123next@list.ru>
Date: Fri, 8 Oct 2010 09:12:02 +0300
Subject: 	modified:   messages.cpp 	modified:   new_gpg.vcproj

---
 messages.cpp   | 6 +++---
 new_gpg.vcproj | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/messages.cpp b/messages.cpp
index b18a93e..ed2108f 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -286,7 +286,8 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 						{
 							string str = pre->szMessage;
 							mir_free((void**)pre->szMessage);
-							str.insert(0, "Failed to decrypt GPG encrypted message:\n");
+							str.insert(0, "Received unencrypted message:\n");
+							debuglog<<"info: Failed to decrypt GPG encrypted message.\n";
 							char *tmp = new char [str.length()+1];
 							strcpy(tmp, str.c_str());
 							pre->szMessage = tmp;
@@ -326,7 +327,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 					{
 						string str = pre->szMessage;
 						mir_free((void**)pre->szMessage);
-						str.insert(0, "Failed to decrypt GPG encrypted message:\n");
+						str.insert(0, "Received unencrypted message:\n");
 						debuglog<<"info: Failed to decrypt GPG encrypted message.\n";
 						pre->szMessage = mir_strdup(str.c_str());
 						return CallService(MS_PROTO_CHAINRECV, w, (LPARAM)ccs);
@@ -352,7 +353,6 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 		wstring str = tmp;
 		mir_free(tmp);
 		mir_free((void**)pre->szMessage);
-		str.insert(0, _T("Received unencrypted message:\n"));
 		pre->szMessage = mir_utf8encodeW(str.c_str());
 		return CallService(MS_PROTO_CHAINRECV, w, (LPARAM)ccs);
 	}
diff --git a/new_gpg.vcproj b/new_gpg.vcproj
index b6731ba..559cafe 100644
--- a/new_gpg.vcproj
+++ b/new_gpg.vcproj
@@ -159,6 +159,7 @@
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="commonheaders.h"
 				PrecompiledHeaderFile="c:\temp\new_gpg.pch"
+				AssemblerOutput="0"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
@@ -187,6 +188,9 @@
 				GenerateDebugInformation="true"
 				AssemblyDebug="1"
 				ProgramDatabaseFile="./$(TargetName).pdb"
+				GenerateMapFile="true"
+				MapFileName="./$(TargetName).map"
+				MapExports="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary=".\Debug/testplug.lib"
-- 
cgit v1.2.3