diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-05 22:10:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-05 22:10:25 +0300 |
| commit | 35e2289786a7f1542573d1a58ebc971970ea981c (patch) | |
| tree | da8887c793611fdbf6072fd477fd8c01c60b8b02 /protocols/IcqOscarJ | |
| parent | f7c00d6dc53774d16b9721e79ed5d4017af63884 (diff) | |
CLIST_INTERFACE::pfnGetContactDisplayName => Clist_GetContactDisplayName
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/src/init.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/stdpackets.cpp | 2 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/utilities.cpp | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index 46e5b68c17..4f6cd06873 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -31,7 +31,6 @@ CMPlugin g_plugin;
HINSTANCE hInst;
int hLangpack;
-CLIST_INTERFACE *pcli;
bool g_bTerminated;
BOOL bPopupService = FALSE;
@@ -85,7 +84,6 @@ IconItem iconList[] = extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- pcli = Clist_GetInterface();
srand(time(nullptr));
_tzset();
diff --git a/protocols/IcqOscarJ/src/stdpackets.cpp b/protocols/IcqOscarJ/src/stdpackets.cpp index 0c6ac962d3..b9b97b89a8 100644 --- a/protocols/IcqOscarJ/src/stdpackets.cpp +++ b/protocols/IcqOscarJ/src/stdpackets.cpp @@ -1346,7 +1346,7 @@ DWORD CIcqProto::icq_sendSMSServ(const char *szPhoneNumber, const char *szMsg) strftime(szTime, sizeof(szTime), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
/* Sun, 00 Jan 0000 00:00:00 GMT */
- char *szMyNick = null_strdup(_T2A(pcli->pfnGetContactDisplayName(NULL, 0)));
+ char *szMyNick = null_strdup(_T2A(Clist_GetContactDisplayName(0)));
size_t nBufferSize = 1 + mir_strlen(szMyNick) + mir_strlen(szPhoneNumber) + mir_strlen(szMsg) + sizeof("<icq_sms_message><destination></destination><text></text><codepage>1252</codepage><encoding>utf8</encoding><senders_UIN>0000000000</senders_UIN><senders_name></senders_name><delivery_receipt>Yes</delivery_receipt><time>Sun, 00 Jan 0000 00:00:00 GMT</time></icq_sms_message>");
if (szBuffer = (char *)_alloca(nBufferSize)) {
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index d4b1aba429..cc3ce357b1 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -544,7 +544,7 @@ char* NickFromHandle(MCONTACT hContact) if (hContact == INVALID_CONTACT_ID)
return null_strdup(Translate("<invalid>"));
- return null_strdup(_T2A(pcli->pfnGetContactDisplayName(hContact, 0)));
+ return null_strdup(_T2A(Clist_GetContactDisplayName(hContact)));
}
char* NickFromHandleUtf(MCONTACT hContact)
@@ -552,7 +552,7 @@ char* NickFromHandleUtf(MCONTACT hContact) if (hContact == INVALID_CONTACT_ID)
return ICQTranslateUtf(LPGEN("<invalid>"));
- return make_utf8_string(pcli->pfnGetContactDisplayName(hContact, 0));
+ return make_utf8_string(Clist_GetContactDisplayName(hContact));
}
char* strUID(DWORD dwUIN, char *pszUID)
|