From ab4abbb7a60f941acab8f0566c6b619f68f1b489 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 27 Jun 2015 11:09:19 +0000 Subject: - CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu; - Menu_AddContactMenuItem now receives parameter szProto; - Menu_Add* helpers are converted into real functions; git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SmileyAdd/src/main.cpp | 2 +- plugins/SmileyAdd/src/services.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/SmileyAdd') diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index 1cc9974b79..506d4be669 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -53,7 +53,7 @@ static int ModulesLoaded(WPARAM, LPARAM) CLISTMENUITEM mi = { 0 }; mi.position = 2000070050; mi.icolibItem = icon.hIcolib; - mi.pszName = LPGEN("Assign smiley category"); + mi.name.a = LPGEN("Assign smiley category"); hContactMenuItem = Menu_AddContactMenuItem(&mi); DownloadInit(); diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index 2cc5413753..773c7cccc9 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -306,7 +306,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM) const int ind = i + 3; mi.position = ind; - mi.ptszName = (TCHAR*)smc[i].GetDisplayName().c_str(); + mi.name.t = (TCHAR*)smc[i].GetDisplayName().c_str(); if (cat == smc[i].GetName()) { mi.flags |= CMIF_CHECKED; @@ -320,7 +320,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM) } mi.position = 1; - mi.ptszName = _T(""); + mi.name.t = _T(""); if (cat == _T("")) { mi.flags |= CMIF_CHECKED; nonecheck = false; @@ -331,7 +331,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM) menuHandleArray.insert(hMenu); mi.position = 2; - mi.ptszName = LPGENT("Protocol specific"); + mi.name.t = LPGENT("Protocol specific"); if (nonecheck) mi.flags |= CMIF_CHECKED; else mi.flags &= ~CMIF_CHECKED; hMenu = Menu_AddContactMenuItem(&mi); -- cgit v1.2.3