CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName

3 files changed, 6 insertions, 9 deletions

diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp
index a9664c377b..c395ad5687 100644
--- a/plugins/WhenWasIt/src/WhenWasIt.cpp
+++ b/plugins/WhenWasIt/src/WhenWasIt.cpp
@@ -29,8 +29,6 @@ int hLangpack;
 

 CommonData commonData = { 0 };

 

-CLIST_INTERFACE *pcli;

-

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

@@ -54,7 +52,6 @@ extern "C" int __declspec(dllexport) Load(void)
 	Log("%s", "Entering function " __FUNCTION__);

 

 	mir_getLP(&pluginInfo);

-	pcli = Clist_GetInterface();

 

 	INITCOMMONCONTROLSEX icex;

 	icex.dwSize = sizeof(icex);

diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp
index 4e1260f834..3f7f6d7ba4 100644
--- a/plugins/WhenWasIt/src/dlg_handlers.cpp
+++ b/plugins/WhenWasIt/src/dlg_handlers.cpp
@@ -417,7 +417,7 @@ INT_PTR CALLBACK DlgProcAddBirthday(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l
 			char *szProto = GetContactProto(hContact);

 

 			wchar_t buffer[2048];

-			mir_snwprintf(buffer, TranslateT("Set birthday for %s:"), pcli->pfnGetContactDisplayName(hContact, 0));

+			mir_snwprintf(buffer, TranslateT("Set birthday for %s:"), Clist_GetContactDisplayName(hContact));

 			SetWindowText(hWnd, buffer);

 

 			HWND hDate = GetDlgItem(hWnd, IDC_DATE);

@@ -605,7 +605,7 @@ int UpdateBirthdayEntry(HWND hList, MCONTACT hContact, int entry, int bShowAll,
 		else

 			ListView_SetItemText(hList, entry, 0, ptszAccName);

 

-		ListView_SetItemText(hList, entry, 1, pcli->pfnGetContactDisplayName(hContact, 0));

+		ListView_SetItemText(hList, entry, 1, Clist_GetContactDisplayName(hContact));

 

 		wchar_t buffer[2048];

 		if ((dtb <= 366) && (dtb >= 0))

diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp
index 91605c80b3..ba5fc70842 100644
--- a/plugins/WhenWasIt/src/notifiers.cpp
+++ b/plugins/WhenWasIt/src/notifiers.cpp
@@ -69,7 +69,7 @@ int PopupNotifyBirthday(MCONTACT hContact, int dtb, int age)
 	if (commonData.bIgnoreSubcontacts && db_mc_isSub(hContact))

 		return 0;

 

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

+	wchar_t *name = Clist_GetContactDisplayName(hContact);

 

 	wchar_t text[1024];

 	BuildDTBText(dtb, name, text, _countof(text));

@@ -113,7 +113,7 @@ int PopupNotifyMissedBirthday(MCONTACT hContact, int dab, int age)
 	if (commonData.bIgnoreSubcontacts && db_mc_isSub(hContact))

 		return 0;

 

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

+	wchar_t *name = Clist_GetContactDisplayName(hContact);

 

 	wchar_t text[1024];

 	BuildDABText(dab, name, text, _countof(text));

@@ -149,7 +149,7 @@ int PopupNotifyMissedBirthday(MCONTACT hContact, int dab, int age)
 

 int DialogNotifyBirthday(MCONTACT hContact, int dtb, int age)

 {

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

+	wchar_t *name = Clist_GetContactDisplayName(hContact);

 

 	wchar_t text[1024];

 	BuildDTBText(dtb, name, text, _countof(text));

@@ -171,7 +171,7 @@ int DialogNotifyBirthday(MCONTACT hContact, int dtb, int age)
 

 int DialogNotifyMissedBirthday(MCONTACT hContact, int dab, int age)

 {

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

+	wchar_t *name = Clist_GetContactDisplayName(hContact);

 

 	wchar_t text[1024];

 	BuildDABText(dab, name, text, _countof(text));