From e254312f9a660c83081ce2062ab14ba3c3614089 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 19 Sep 2017 14:12:58 +0300 Subject: useless structure GCDEST finally removed --- plugins/TabSRMM/src/chat_main.cpp | 2 +- plugins/TabSRMM/src/chat_tools.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/src/chat_main.cpp b/plugins/TabSRMM/src/chat_main.cpp index 02c906685f..d817fd08e7 100644 --- a/plugins/TabSRMM/src/chat_main.cpp +++ b/plugins/TabSRMM/src/chat_main.cpp @@ -227,7 +227,7 @@ static int OnHandleGCMenu(WPARAM, LPARAM lParam) return 1; if (gch->dwData == 20020) { // add to highlight... - SESSION_INFO *si = pci->SM_FindSession(gch->pDest->ptszID, gch->pDest->pszModule); + SESSION_INFO *si = pci->SM_FindSession(gch->ptszID, gch->pszModule); THighLightEdit the = { THighLightEdit::CMD_ADD, si, pci->UM_FindUser(si->pUsers, gch->ptszUID) }; HWND hwndParent = si->pDlg->m_pContainer->m_hwnd; HWND hwndDlg = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_ADDHIGHLIGHT), hwndParent, CMUCHighlight::dlgProcAdd, (LPARAM)&the); diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp index 864745498f..463b48320f 100644 --- a/plugins/TabSRMM/src/chat_tools.cpp +++ b/plugins/TabSRMM/src/chat_tools.cpp @@ -78,7 +78,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA BOOL DoTrayIcon(SESSION_INFO *si, GCEVENT *gce) { - int iEvent = gce->pDest->iType; + int iEvent = gce->iType; if (si && (iEvent & si->iLogTrayFlags)) return oldDoTrayIcon(si, gce); return TRUE; @@ -129,7 +129,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoNa BOOL DoPopup(SESSION_INFO *si, GCEVENT *gce) { - int iEvent = gce->pDest->iType; + int iEvent = gce->iType; if (si == nullptr || !(iEvent & si->iLogPopupFlags)) return true; @@ -301,12 +301,12 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight params->bInactive = FALSE; } params->bActiveTab = params->bMustFlash = params->bMustAutoswitch = FALSE; - params->iEvent = gce->pDest->iType; + params->iEvent = gce->iType; WPARAM wParamForHighLight = 0; bool bFlagUnread = false; if (bHighlight) { - gce->pDest->iType |= GC_EVENT_HIGHLIGHT; + gce->iType |= GC_EVENT_HIGHLIGHT; params->sound = "ChatHighlight"; if (db_get_b(si->hContact, "CList", "Hidden", 0) != 0) db_unset(si->hContact, "CList", "Hidden"); @@ -489,7 +489,7 @@ BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce) /* * check whether we have to log this event */ - if (!(gce->pDest->iType & si->iDiskLogFlags)) + if (!(gce->iType & si->iDiskLogFlags)) return FALSE; return oldLogToFile(si, gce); // call kernel method -- cgit v1.2.3