- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

1 files changed, 10 insertions, 5 deletions

diff --git a/plugins/New_GPG/src/utilities.h b/plugins/New_GPG/src/utilities.h
index ef3fbced23..3b884a3846 100644
--- a/plugins/New_GPG/src/utilities.h
+++ b/plugins/New_GPG/src/utilities.h
@@ -16,17 +16,22 @@
 

 #ifndef UTILITIES_H

 #define UTILITIES_H

-TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef);

-char* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, char* szDef);

+TCHAR* __stdcall UniGetContactSettingUtf(HCONTACT hContact, const char *szModule,const char* szSetting, TCHAR* szDef);

+char* __stdcall UniGetContactSettingUtf(HCONTACT hContact, const char *szModule,const char* szSetting, char* szDef);

 void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc);

 TCHAR *GetFilePath(TCHAR *WindowTittle, TCHAR *szExt, TCHAR *szExtDesc, bool save_file = false);

 void GetFolderPath(TCHAR *WindowTittle, char *szSetting);

 

 void storeOutput(HANDLE ahandle, string *output);

 

+void setSrmmIcon(HCONTACT);

+void setClistIcon(HCONTACT);

+

+void send_encrypted_msgs_thread(void*);
+

 int ComboBoxAddStringUtf(HWND hCombo, const TCHAR *szString, DWORD data);

-bool isContactSecured(HANDLE hContact);

-bool isContactHaveKey(HANDLE hContact);

+bool isContactSecured(HCONTACT hContact);

+bool isContactHaveKey(HCONTACT hContact);

 bool isTabsrmmUsed();

 bool isGPGKeyExist();

 bool isGPGValid();

@@ -99,7 +104,7 @@ public:
 		cbSize = 0;

 	}

 };

-void HistoryLog(HANDLE, db_event);

+void HistoryLog(HCONTACT, db_event);

 void fix_line_term(std::string &s);

 void fix_line_term(std::wstring &s);

 void strip_line_term(std::wstring &s);