diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
| commit | ddba4ede6b451d0cfcd0d32b5180fbd0689966bf (patch) | |
| tree | 5d74f37a7013d13b92c182628d6b68a58e148ae4 /plugins/Clist_modern/src/modern_awaymsg.cpp | |
| parent | c39340bf493a1745a41317bbf937fc7eb6cbb26a (diff) | |
- 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
Diffstat (limited to 'plugins/Clist_modern/src/modern_awaymsg.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_awaymsg.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp index 7953807781..b9b66caab0 100644 --- a/plugins/Clist_modern/src/modern_awaymsg.cpp +++ b/plugins/Clist_modern/src/modern_awaymsg.cpp @@ -42,13 +42,10 @@ static LIST<void> amItems(10, PtrKeySortT); static HANDLE hamProcessEvent = NULL;
static DWORD amRequestTick = 0;
-static int amAddHandleToChain(HANDLE hContact);
-static HANDLE amGetCurrentChain();
-
/*
* Add contact handle to requests queue
*/
-static int amAddHandleToChain(HANDLE hContact)
+static int amAddHandleToChain(HCONTACT hContact)
{
mir_cslockfull lck(amCS);
if (amItems.find(hContact) != NULL)
@@ -63,13 +60,13 @@ static int amAddHandleToChain(HANDLE hContact) /*
* Gets handle from queue for request
*/
-static HANDLE amGetCurrentChain()
+static HCONTACT amGetCurrentChain()
{
mir_cslock lck(amCS);
if (amItems.getCount() == 0)
return NULL;
- HANDLE res = amItems[0];
+ HCONTACT res = (HCONTACT)amItems[0];
amItems.remove(0);
return res;
}
@@ -85,7 +82,7 @@ static void amThreadProc(void *) memset(&dnce, 0, sizeof(dnce));
while (!MirandaExiting()) {
- HANDLE hContact = amGetCurrentChain();
+ HCONTACT hContact = amGetCurrentChain();
while (hContact) {
DWORD time = GetTickCount();
if ((time-amRequestTick) < AMASKPERIOD) {
@@ -94,7 +91,7 @@ static void amThreadProc(void *) return;
}
CListSettings_FreeCacheItemData(&dnce);
- dnce.hContact = (HANDLE)hContact;
+ dnce.hContact = hContact;
Sync(CLUI_SyncGetPDNCE, (WPARAM) 0, (LPARAM)&dnce);
HANDLE ACK = 0;
@@ -146,7 +143,7 @@ BOOL amWakeThread() /*
* Sub to be called outside on status changing to retrieve away message
*/
-void amRequestAwayMsg(HANDLE hContact)
+void amRequestAwayMsg(HCONTACT hContact)
{
if (!g_CluiData.bInternalAwayMsgDiscovery || !hContact)
return;
|