From 4b69cb37370299462344633385da52896c7078fd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 28 Mar 2017 22:48:29 +0300 Subject: two more useless calls of SM_FindSessionByHCONTACT removed --- plugins/TabSRMM/src/container.cpp | 14 ++------------ plugins/TabSRMM/src/hotkeyhandler.cpp | 16 ---------------- 2 files changed, 2 insertions(+), 28 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index cf7ed520da..91debd2d38 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -71,21 +71,11 @@ void TContainerData::UpdateTitle(MCONTACT hContact, CTabBaseDlg *pDlg) CTabBaseDlg *dat = nullptr; if (hContact == 0) { // no hContact given - obtain the hContact for the active tab if (m_hwndActive && IsWindow(m_hwndActive)) - SendMessage(m_hwndActive, DM_QUERYHCONTACT, 0, (LPARAM)&hContact); - else - return; - dat = (CTabBaseDlg*)GetWindowLongPtr(m_hwndActive, GWLP_USERDATA); + dat = (CTabBaseDlg*)GetWindowLongPtr(m_hwndActive, GWLP_USERDATA); } else { HWND hwnd = M.FindWindow(hContact); - if (hwnd == nullptr) { - SESSION_INFO *si = SM_FindSessionByHCONTACT(hContact); - if (si) { - si->pDlg->UpdateTitle(); - return; - } - } - if (hwnd && hContact) + if (hwnd != nullptr) dat = (CTabBaseDlg*)GetWindowLongPtr(hwnd, GWLP_USERDATA); } if (dat) { diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index c1052eecd0..226298640e 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -107,22 +107,6 @@ void TSAPI HandleMenuEntryFromhContact(MCONTACT hContact) return; } - SESSION_INFO *si = SM_FindSessionByHCONTACT(hContact); - if (si != nullptr) { - // session does exist, but no window is open for it - if (si->pDlg) { - TContainerData *pContainer = 0; - SendMessage(si->pDlg->GetHwnd(), DM_QUERYCONTAINER, 0, (LPARAM)&pContainer); - if (pContainer) { - ActivateExistingTab(pContainer, si->pDlg->GetHwnd()); - if (GetForegroundWindow() != pContainer->m_hwnd) - SetForegroundWindow(pContainer->m_hwnd); - SetFocus(GetDlgItem(pContainer->m_hwndActive, IDC_SRMM_MESSAGE)); - return; - } - } - } - Clist_ContactDoubleClicked(hContact); } -- cgit v1.2.3