From f9c9f7a27456f98ac84f27add1c2aea5bd99a35c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 08:42:33 +0000
Subject: more HCONTACT

git-svn-id: http://svn.miranda-ng.org/main/trunk@8079 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/New_GPG/src/init.cpp         | 2 +-
 plugins/New_GPG/src/main.h           | 2 +-
 plugins/New_GPG/src/messages.cpp     | 2 --
 plugins/New_GPG/src/metacontacts.cpp | 2 +-
 plugins/New_GPG/src/options.cpp      | 3 ---
 plugins/New_GPG/src/utilities.cpp    | 2 +-
 6 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'plugins/New_GPG')

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index b0a2232cce..fd21bdaf2f 100644
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -31,7 +31,7 @@ XML_API xi = {0};
 int hLangpack = 0;
 logtofile debuglog;
 bool gpg_valid = false, gpg_keyexist = false;
-std::map<HANDLE, contact_data> hcontact_data;
+std::map<HCONTACT, contact_data> hcontact_data;
 
 PLUGININFOEX pluginInfo={
 	sizeof(PLUGININFOEX),
diff --git a/plugins/New_GPG/src/main.h b/plugins/New_GPG/src/main.h
index 353dee0aae..36a7bafb0f 100644
--- a/plugins/New_GPG/src/main.h
+++ b/plugins/New_GPG/src/main.h
@@ -22,7 +22,7 @@ struct contact_data
 	string key_in_prescense;
 };
 
-extern std::map<HANDLE, contact_data> hcontact_data;
+extern std::map<HCONTACT, contact_data> hcontact_data;
 extern bool bAutoExchange;
 extern RECT key_from_keyserver_rect, firstrun_rect, new_key_rect, key_gen_rect, load_key_rect, import_key_rect, key_password_rect, load_existing_key_rect;
 
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index b9deb63655..514f7ae2c8 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -485,8 +485,6 @@ INT_PTR RecvMsgSvc(WPARAM w, LPARAM l)
 					}
 					db_set_b(ccs->hContact, szGPGModuleName, "GPGEncryption", 1);
 					db_set_b(ccs->hContact, szGPGModuleName, "bAlwatsTrust", 1);
-					void setSrmmIcon(HANDLE);
-					void setClistIcon(HANDLE);
 					setSrmmIcon(ccs->hContact);
 					setClistIcon(ccs->hContact);
 					if(metaIsSubcontact(ccs->hContact))
diff --git a/plugins/New_GPG/src/metacontacts.cpp b/plugins/New_GPG/src/metacontacts.cpp
index dcf7667f4f..27c6963213 100644
--- a/plugins/New_GPG/src/metacontacts.cpp
+++ b/plugins/New_GPG/src/metacontacts.cpp
@@ -32,7 +32,7 @@ bool metaIsProtoMetaContacts(HCONTACT hContact)
 bool metaIsDefaultSubContact(HCONTACT hContact) 
 {
 	if(bMetaContacts)
-		return (HANDLE)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0),0)==hContact;
+		return (HCONTACT)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0),0)==hContact;
 	return false;
 }
 
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index 75279c7e96..3f43a4e9fd 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -738,7 +738,6 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
 				msg += (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hcnt, 0);
 				SetWindowTextA(hwndDlg, msg.c_str());
 			}
-			bool isContactSecured(HANDLE);
 			if(!hcnt)
 			{
 				EnableWindow(GetDlgItem(hwndDlg, IDC_SELECT_EXISTING), 0);
@@ -1182,8 +1181,6 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
 					key_buf.clear();
 					if(IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ENCRYPTION))
 					{
-						void setSrmmIcon(HANDLE);
-						void setClistIcon(HANDLE);
 						if(hContact)
 						{
 							if(metaIsProtoMetaContacts(hContact))
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index d1122dca94..1170542944 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -1754,7 +1754,7 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l)
 						string output;
 						DWORD exitcode;
 						{
-							HANDLE hcnt = hContact;
+							HCONTACT hcnt = hContact;
 							ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
 							path = ptmp;
 							mir_free(ptmp);
-- 
cgit v1.2.3