diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-09-18 21:52:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-09-18 21:52:10 +0000 |
| commit | 6d932bfaf11e4699355fedc45e28b353b8877130 (patch) | |
| tree | 78d3f6741cf9762d2c6b97ed1f5bc472e850e15f /protocols/WhatsApp/src/theme.cpp | |
| parent | 4dd774d667df90583315c04696537b6397f6fc02 (diff) | |
merge into trunk
git-svn-id: http://svn.miranda-ng.org/main/trunk@10515 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/WhatsApp/src/theme.cpp')
| -rw-r--r-- | protocols/WhatsApp/src/theme.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp index 3597084672..3376291af0 100644 --- a/protocols/WhatsApp/src/theme.cpp +++ b/protocols/WhatsApp/src/theme.cpp @@ -106,7 +106,7 @@ int WhatsAppProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM lParam) {
MCONTACT hContact = MCONTACT(wParam);
if (hContact)
- debugLogA(this->GetContactDisplayName(hContact).c_str());
+ debugLog(pcli->pfnGetContactDisplayName(hContact, 0));
else
debugLogA("No contact found");
@@ -153,11 +153,10 @@ int WhatsAppProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM lParam) {
fullSvcName = svcName + dbv.pszVal;
mi.pszService = (char*) fullSvcName.c_str();
- mi.ptszName = mir_a2t_cp(this->GetContactDisplayName(it->first).c_str(), CP_UTF8);
+ mi.ptszName = pcli->pfnGetContactDisplayName(it->first, 0);
CreateServiceFunctionParam(mi.pszService, GlobalServiceParam<&WhatsAppProto::OnAddContactToGroup>, (LPARAM) it->first);
Menu_AddContactMenuItem(&mi);
db_free(&dbv);
- mir_free(mi.ptszName);
iGrpCount++;
}
}
@@ -205,12 +204,11 @@ int WhatsAppProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM lParam) {
fullSvcName = svcName + dbv.pszVal;
mi.pszService = (char*) fullSvcName.c_str();
- mi.ptszName = mir_a2t_cp(this->GetContactDisplayName(it->first).c_str(), CP_UTF8);
+ mi.ptszName = pcli->pfnGetContactDisplayName(it->first, 0);
CreateServiceFunctionParam(mi.pszService,
GlobalServiceParam<&WhatsAppProto::OnRemoveContactFromGroup>, (LPARAM) it->first);
Menu_AddContactMenuItem(&mi);
db_free(&dbv);
- mir_free(mi.ptszName);
bShow = true;
}
}
@@ -227,7 +225,7 @@ int WhatsAppProto::OnPrebuildContactMenu(WPARAM wParam,LPARAM lParam) int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam)
{
- debugLogA("");
+
char text[200];
strcpy(text, m_szModuleName);
char *tDest = text + strlen(text);
|