UM_FindUserFromIndex: another major useless crutch died

3 files changed, 3 insertions, 32 deletions

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index ba50c46a25..4188ef3b2c 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -870,15 +870,6 @@ LRESULT CMsgDialog::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam)
 		break;

 

 	case WM_KEYDOWN:

-		if (wParam == VK_RETURN) {

-			int index = m_nickList.SendMsg(LB_GETCURSEL, 0, 0);

-			if (index != LB_ERR) {

-				USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, index);

-				Chat_DoEventHook(m_si, GC_USER_PRIVMESS, ui, nullptr, 0);

-			}

-			break;

-		}

-

 		if (wParam == VK_ESCAPE || wParam == VK_UP || wParam == VK_DOWN || wParam == VK_NEXT || wParam == VK_PRIOR || wParam == VK_TAB || wParam == VK_HOME || wParam == VK_END)

 			m_wszSearch[0] = 0;

 		break;

@@ -910,11 +901,11 @@ LRESULT CMsgDialog::WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam)
 		if (m_wszSearch[0]) {

 			// iterate over the (sorted) list of nicknames and search for the

 			// string we have

-			int iItems = m_nickList.SendMsg(LB_GETCOUNT, 0, 0);

+			int iItems = m_nickList.GetCount();

 			for (int i = 0; i < iItems; i++) {

-				if (USERINFO *ui = g_chatApi.UM_FindUserFromIndex(m_si, i)) {

+				if (auto *ui = (USERINFO*)m_nickList.GetItemData(i)) {

 					if (!wcsnicmp(ui->pszNick, m_wszSearch, mir_wstrlen(m_wszSearch))) {

-						m_nickList.SendMsg(LB_SETCURSEL, i, 0);

+						m_nickList.SetCurSel(i);

 						InvalidateRect(m_nickList.GetHwnd(), nullptr, FALSE);

 						return 0;

 					}

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 36b036f77c..e2b200c13f 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -137,7 +137,6 @@ public:
 	void SetStatusText(const wchar_t *, HICON) override;

 	void ShowFilterMenu() override;

 	void UpdateFilterButton() override;

-	void UpdateNickList() override;

 	void UpdateOptions() override;

 	void UpdateStatusBar() override;

 	void UpdateTitle() override;

diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index c0ed8bca78..c6d9b8589e 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -574,25 +574,6 @@ void CMsgDialog::UpdateFilterButton()
 	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)g_plugin.getIcon(m_bNicklistEnabled ? IDI_NICKLIST2 : IDI_NICKLIST));
 }
 
-void CMsgDialog::UpdateNickList()
-{
-	m_nickList.SetDraw(false);
-	m_nickList.ResetContent();
-	for (auto &ui : m_si->getUserList()) {
-		char szIndicator = SM_GetStatusIndicator(m_si, ui);
-		if (szIndicator > '\0') {
-			wchar_t ptszBuf[128];
-			mir_snwprintf(ptszBuf, L"%c%s", szIndicator, ui->pszNick);
-			m_nickList.AddString(ptszBuf);
-		}
-		else m_nickList.AddString(ui->pszNick);
-	}
-	m_nickList.SetDraw(true);
-	InvalidateRect(m_nickList.GetHwnd(), nullptr, FALSE);
-	UpdateWindow(m_nickList.GetHwnd());
-	UpdateTitle();
-}
-
 void CMsgDialog::UpdateOptions()
 {
 	GetAvatar();