modified: init.cpp

	modified:   messages.cpp
	modified:   new_gpg.rc
	modified:   new_gpg.vcproj
	modified:   options.cpp
	modified:   srmm.cpp
	modified:   utilities.cpp

1 files changed, 3 insertions, 6 deletions

diff --git a/srmm.cpp b/srmm.cpp
index d5f6061..b9f8ea1 100644
--- a/srmm.cpp
+++ b/srmm.cpp
@@ -45,7 +45,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
 	
 	void setSrmmIcon(HANDLE);

 	void setClistIcon(HANDLE);

-	TCHAR *key = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
+	bool isContactHaveKey(HANDLE hContact);

 	BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
 	if(enc)
 	{
@@ -55,7 +55,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
 	}

 	else if(!enc)

 	{

-		if(_tcslen(key) < 1)

+		if(!isContactHaveKey(hContact))

 		{

 			void ShowLoadPublicKeyDialog();

 			extern map<int, HANDLE> user_data;

@@ -69,12 +69,9 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
 			DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);

 			setSrmmIcon(hContact);

 			setClistIcon(hContact);

-			mir_free(key);

 			return 0;

 		}

-		mir_free(key);

-		key = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));

-		if(_tcslen(key) > 0)

+		if(isContactHaveKey(hContact))

 		{

 			DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);

 			setSrmmIcon(hContact);