CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

4 files changed, 4 insertions, 7 deletions

diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h
index c1836b44d6..58c5b5cc01 100644
--- a/plugins/FavContacts/src/favlist.h
+++ b/plugins/FavContacts/src/favlist.h
@@ -17,7 +17,7 @@ public:
 		bManual(_bManual),

 		fRate(_fRate)

 	{

-		name = mir_wstrdup(pcli->pfnGetContactDisplayName(hContact, 0));

+		name = mir_wstrdup(Clist_GetContactDisplayName(hContact));

 

 		if (g_Options.bUseGroups) {

 			if ((group = db_get_wsa(hContact, "CList", "Group")) == nullptr)

diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp
index d71e1c536d..c3c97ca5b5 100644
--- a/plugins/FavContacts/src/http_api.cpp
+++ b/plugins/FavContacts/src/http_api.cpp
@@ -74,7 +74,7 @@ public:
 		for (int i = 0; i < favList.getCount(); ++i)

 		{

 			MCONTACT hContact = favList[i]->getHandle();

-			wchar_t *name = (wchar_t *)pcli->pfnGetContactDisplayName(hContact, 0);

+			wchar_t *name = Clist_GetContactDisplayName(hContact);

 			AVATARCACHEENTRY *avatar = (AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, hContact, 0);

 			int status = db_get_w(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE);

 

diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 149a9527ad..dedc1cb097 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "http_api.h"

 

-CLIST_INTERFACE *pcli;

-

 HINSTANCE g_hInst;

 

 int hLangpack;

@@ -67,7 +65,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)
 extern "C" __declspec(dllexport) int Load(void)

 {

 	mir_getLP(&pluginInfo);

-	pcli = Clist_GetInterface();

 

 	g_contactCache = new CContactCache;

 

diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp
index 8ccf417fa5..04335bf433 100644
--- a/plugins/FavContacts/src/menu.cpp
+++ b/plugins/FavContacts/src/menu.cpp
@@ -89,7 +89,7 @@ static BOOL sttMeasureItem_Contact(LPMEASUREITEMSTRUCT lpmis, Options *options)
 			mir_free(title);

 	}

 

-	wchar_t *name = (wchar_t *)pcli->pfnGetContactDisplayName(hContact, 0);

+	wchar_t *name = Clist_GetContactDisplayName(hContact);

 

 	if (!options->bSysColors) SelectObject(hdc, g_Options.hfntName);

 	GetTextExtentPoint32(hdc, name, (int)mir_wstrlen(name), &sz);

@@ -301,7 +301,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = nullp
 	}

 

 	if (true) {

-		wchar_t *name = (wchar_t *)pcli->pfnGetContactDisplayName(hContact, 0);

+		wchar_t *name = Clist_GetContactDisplayName(hContact);

 

 		if (!options->bSysColors)

 			SelectObject(hdcTemp, g_Options.hfntName);