- 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

3 files changed, 4 insertions, 4 deletions

diff --git a/plugins/Scriver/src/chat/chat.h b/plugins/Scriver/src/chat/chat.h
index 795a882eee..4481f69b4e 100644
--- a/plugins/Scriver/src/chat/chat.h
+++ b/plugins/Scriver/src/chat/chat.h
@@ -93,7 +93,7 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 void   Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedraw);

 void   LoadMsgLogBitmaps(void);

 void   FreeMsgLogBitmaps(void);

-TCHAR* GetChatLogsFilename (HANDLE  hContact, time_t tTime);

+TCHAR* GetChatLogsFilename(HCONTACT hContact, time_t tTime);

 

 // window.c

 int GetTextPixelSize( TCHAR* pszText, HFONT hFont, BOOL bWidth);

@@ -105,7 +105,7 @@ int OptionsInit(void);
 void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground);

 

 // manager.c

-HWND          SM_FindWindowByContact(HANDLE hContact);

+HWND          SM_FindWindowByContact(HCONTACT hContact);

 SESSION_INFO* SM_FindSessionAutoComplete(const char* pszModule, SESSION_INFO* currSession, SESSION_INFO* prevSession, const TCHAR* pszOriginal, const TCHAR* pszCurrent);

 char          SM_GetStatusIndicator(SESSION_INFO *si, USERINFO *ui);

 

diff --git a/plugins/Scriver/src/chat/manager.cpp b/plugins/Scriver/src/chat/manager.cpp
index 821a82bde6..51b1b7b4e0 100644
--- a/plugins/Scriver/src/chat/manager.cpp
+++ b/plugins/Scriver/src/chat/manager.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "../commonheaders.h"

 

-HWND SM_FindWindowByContact(HANDLE hContact)

+HWND SM_FindWindowByContact(HCONTACT hContact)

 {

 	SESSION_INFO *pTemp = pci->wndList;

 

diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp
index e5b2cfc617..196d868a7f 100644
--- a/plugins/Scriver/src/chat/tools.cpp
+++ b/plugins/Scriver/src/chat/tools.cpp
@@ -152,7 +152,7 @@ BOOL DoEventHookAsync(HWND hwnd, const TCHAR *pszID, const char* pszModule, int
 	return TRUE;

 }

 

-TCHAR* GetChatLogsFilename(HANDLE  hContact, time_t tTime)

+TCHAR* GetChatLogsFilename(HCONTACT hContact, time_t tTime)

 {

 	REPLACEVARSARRAY rva[11];

 	TCHAR *p = { 0 }, *tszParsedName = { 0 };