diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 14:42:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 14:42:51 +0000 |
| commit | 33953cc6a0fab6a91af293c6838f8a46dd7922da (patch) | |
| tree | 2dbbe718ad42545bde6c9f7672387827c530550a /plugins/Sessions | |
| parent | e190a7fde521bd6af9ea485cc730f854aaf38e11 (diff) | |
HCONTACT, part 3
git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Sessions')
| -rw-r--r-- | plugins/Sessions/Src/Main.cpp | 3 | ||||
| -rw-r--r-- | plugins/Sessions/Src/Options.cpp | 2 | ||||
| -rw-r--r-- | plugins/Sessions/Src/Utils.cpp | 8 | ||||
| -rw-r--r-- | plugins/Sessions/Src/Utils.h | 6 |
4 files changed, 10 insertions, 9 deletions
diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 475e00ad62..6e50caec00 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -790,7 +790,8 @@ static int GetContactHandle(WPARAM wparam,LPARAM lParam) if (g_bCrashRecovery) db_set_b(MWeventdata->hContact, MODNAME, "wasInLastSession", 1);
}
else if (MWeventdata->uType == MSG_WINDOW_EVT_CLOSE) {
- if (!DONT) DelFromCurSession(MWeventdata->hContact,0);
+ if (!DONT)
+ DelFromCurSession(MWeventdata->hContact,0);
if (g_bCrashRecovery) db_set_b(MWeventdata->hContact, MODNAME, "wasInLastSession", 0);
}
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp index 64932b37e7..9a6853f29d 100644 --- a/plugins/Sessions/Src/Options.cpp +++ b/plugins/Sessions/Src/Options.cpp @@ -31,7 +31,7 @@ static BOOL bOptionsInit; int opses_count;
BOOL bSesssionNameChanged=0;
-HANDLE session_list_t[255]={0};
+HCONTACT session_list_t[255]={0};
HWND g_opHdlg;
diff --git a/plugins/Sessions/Src/Utils.cpp b/plugins/Sessions/Src/Utils.cpp index dd5315185a..0ac06a0e1c 100644 --- a/plugins/Sessions/Src/Utils.cpp +++ b/plugins/Sessions/Src/Utils.cpp @@ -332,7 +332,7 @@ int AddToCurSession(HCONTACT wparam, LPARAM lparam) return 0;
}
-int DelFromCurSession(HANDLE wparam,LPARAM lparam)
+int DelFromCurSession(HCONTACT wparam,LPARAM lparam)
{
for (int i=0; session_list[i] != 0; i++) {
if (session_list[i] == wparam) {
@@ -346,11 +346,11 @@ int DelFromCurSession(HANDLE wparam,LPARAM lparam) return 0;
}
-int CheckForDuplicate(HCONTACT contact_list[], HANDLE lparam)
+int CheckForDuplicate(HCONTACT contact_list[], HCONTACT lparam)
{
int i=0;
- HANDLE s_list[255] = {0};
- memcpy(s_list, contact_list,SIZEOF(s_list));
+ HCONTACT s_list[255] = {0};
+ memcpy(s_list, contact_list, SIZEOF(s_list));
for (i=0;;i++) {
if (s_list[i] == lparam)
return i;
diff --git a/plugins/Sessions/Src/Utils.h b/plugins/Sessions/Src/Utils.h index 174ef38afc..19d81dad37 100644 --- a/plugins/Sessions/Src/Utils.h +++ b/plugins/Sessions/Src/Utils.h @@ -27,9 +27,9 @@ void AddSessionMark(HCONTACT hContact,int mode,char bit); void RemoveSessionMark(HCONTACT hContact,int mode,int marknum);
void SetSessionMark(HCONTACT hContact,int mode,char bit,unsigned int marknum);
BOOL LoadContactsFromMask(HCONTACT hContact,int mode,int count);
-int AddToCurSession(HCONTACT wparam, LPARAM lparam);
-int DelFromCurSession(HANDLE wparam,LPARAM lparam);
-int CheckForDuplicate(HCONTACT contact_list[], HANDLE lparam);
+int AddToCurSession(HCONTACT hContact, LPARAM lparam);
+int DelFromCurSession(HCONTACT hContact,LPARAM lparam);
+int CheckForDuplicate(HCONTACT contact_list[], HCONTACT lparam);
BOOL ResaveSettings(char* szName,int iFirst,int iLimit,TCHAR* pszPrevSetting);
void OffsetWindow(HWND parent, HWND hwnd, int dx, int dy);
int LoadSessionToCombobox (HWND hdlg,BOOL mode,int iLimit,char* pszSetting,int iFirstNum);
|