diff options
Diffstat (limited to 'plugins/UserInfoEx/src')
| -rw-r--r-- | plugins/UserInfoEx/src/classMAnnivDate.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/dlg_propsheet.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/mir_db.h | 3 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/svc_refreshci.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/svc_reminder.cpp | 12 |
8 files changed, 12 insertions, 15 deletions
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp index 81187c6502..5a38ef72f5 100644 --- a/plugins/UserInfoEx/src/classMAnnivDate.cpp +++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp @@ -688,7 +688,7 @@ static WORD AskUser(MCONTACT hContact, MAnnivDate *pOldCustomDate, MAnnivDate *p mir_snwprintf(szMsg,
TranslateT("%s provides a new birthday via protocol.\nIt is %s. The old one was %s.\n\nDo you want to use this as the new birthday for this contact?"),
- DB::Contact::DisplayName(hContact), szDate, szoldDate);
+ Clist_GetContactDisplayName(hContact), szDate, szoldDate);
MB.cbSize = sizeof(MSGBOX);
MB.hParent = nullptr;
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 73ab8c733b..b5f9e95614 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -695,7 +695,7 @@ class CAnnivList }
// second column: contact name
- AddSubItem(iItem, COLUMN_CONTACT, DB::Contact::DisplayName(hContact));
+ AddSubItem(iItem, COLUMN_CONTACT, Clist_GetContactDisplayName(hContact));
// third column: protocol
wchar_t *ptszProto = mir_a2u(pszProto);
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 3e4807a5ee..0ad616897e 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -1091,7 +1091,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar else if (pdbcws && pdbcws->value.type == DBVT_WCHAR)
pszName = pdbcws->value.ptszVal;
else
- pszName = DB::Contact::DisplayName(pPs->hContact);
+ pszName = Clist_GetContactDisplayName(pPs->hContact);
HWND hName = GetDlgItem(hDlg, TXT_NAME);
SetWindowText(hName, pszName);
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index 2be1bf0365..56c501d28c 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -208,7 +208,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar name = TranslateT("Owner");
}
else {
- name = DB::Contact::DisplayName(pDat->ExImContact->hContact);
+ name = Clist_GetContactDisplayName(pDat->ExImContact->hContact);
}
break;
case EXIM_SUBGROUP:
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp index cce65ecc2d..b7ddb5b4a7 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp @@ -53,7 +53,7 @@ static void DisplayNameToFileName(lpExImParam ExImContact, LPSTR pszFileName, WO return;
}
- disp = temp = mir_u2a(pcli->pfnGetContactDisplayName(ExImContact->hContact, NULL));
+ disp = temp = mir_u2a(Clist_GetContactDisplayName(ExImContact->hContact));
break;
case EXIM_SUBGROUP:
diff --git a/plugins/UserInfoEx/src/mir_db.h b/plugins/UserInfoEx/src/mir_db.h index f085c8b87d..3289d35405 100644 --- a/plugins/UserInfoEx/src/mir_db.h +++ b/plugins/UserInfoEx/src/mir_db.h @@ -28,9 +28,6 @@ namespace DB { * or modify contacts in the database.
**/
namespace Contact {
- __forceinline LPTSTR DisplayName(MCONTACT hContact)
- { return pcli->pfnGetContactDisplayName(hContact, 0);
- }
DWORD WhenAdded(DWORD dwUIN, LPCSTR szBaseProto);
} /* namespace Contact */
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index f340a300c3..c1a9ac3bf7 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -624,7 +624,7 @@ class CContactUpdater : public CContactQueue if (_pProgress)
{
_pProgress->SetTextParam(TranslateT("[b]%s (%S)...[/b]\n%d Contacts remaining"),
- DB::Contact::DisplayName(_hContact), pszProto, Size());
+ Clist_GetContactDisplayName(_hContact), pszProto, Size());
}
if (IsProtoOnline(pszProto))
{
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index a291ec092a..b2dafa8374 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -255,7 +255,7 @@ static int NotifyWithPopup(MCONTACT hContact, CEvent::EType eventType, int DaysT if (hContact) {
ppd.lchContact = hContact;
- mir_snwprintf(ppd.lptzContactName, L"%s - %s", TranslateW(pszDesc), DB::Contact::DisplayName(hContact));
+ mir_snwprintf(ppd.lptzContactName, L"%s - %s", TranslateW(pszDesc), Clist_GetContactDisplayName(hContact));
}
else mir_wstrncpy(ppd.lptzContactName, TranslateT("Reminder"), _countof(ppd.lptzContactName));
@@ -317,12 +317,12 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt) switch (evt._eType) {
case CEvent::BIRTHDAY:
- mir_snwprintf(szMsg, TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("Birthday"));
+ mir_snwprintf(szMsg, TranslateT("%s has %s today."), Clist_GetContactDisplayName(hContact), TranslateT("Birthday"));
cle.hIcon = IcoLib_GetIcon(ICO_COMMON_BIRTHDAY);
break;
case CEvent::ANNIVERSARY:
- mir_snwprintf(szMsg, TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("an anniversary"));
+ mir_snwprintf(szMsg, TranslateT("%s has %s today."), Clist_GetContactDisplayName(hContact), TranslateT("an anniversary"));
cle.hIcon = IcoLib_GetIcon(ICO_COMMON_ANNIVERSARY);
break;
@@ -481,13 +481,13 @@ static bool CheckBirthday(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE bNoti switch (Diff) {
case 0:
- cchMsg = mir_snwprintf(szMsg, TranslateT("%s has birthday today."), DB::Contact::DisplayName(hContact));
+ cchMsg = mir_snwprintf(szMsg, TranslateT("%s has birthday today."), Clist_GetContactDisplayName(hContact));
break;
case 1:
- cchMsg = mir_snwprintf(szMsg, TranslateT("%s has birthday tomorrow."), DB::Contact::DisplayName(hContact));
+ cchMsg = mir_snwprintf(szMsg, TranslateT("%s has birthday tomorrow."), Clist_GetContactDisplayName(hContact));
break;
default:
- cchMsg = mir_snwprintf(szMsg, TranslateT("%s has birthday in %d days."), DB::Contact::DisplayName(hContact), Diff);
+ cchMsg = mir_snwprintf(szMsg, TranslateT("%s has birthday in %d days."), Clist_GetContactDisplayName(hContact), Diff);
}
int age = mtb.Age(&Now);
if (age > 0)
|