diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-09-25 13:41:55 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-09-25 13:41:55 +0300 |
| commit | c6f59d75142b7568dd89f5cff691b0b58030aafd (patch) | |
| tree | 6fd83d9e6a71bbf7a750a1983922121265acadd7 /plugins/Clist_modern/src | |
| parent | 53669871fc860856c80c2d79cb6b21d52ea25440 (diff) | |
SmileyAdd: fix for the obsolete quirks in SmaileyAdd API
Diffstat (limited to 'plugins/Clist_modern/src')
| -rw-r--r-- | plugins/Clist_modern/src/modern_cachefuncs.cpp | 7 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clc.cpp | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index 1fff523f92..a6bfa12a9d 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -183,8 +183,7 @@ void CSmileyString::ReplaceSmileys(ClcData *dat, ClcCacheEntry *pdnce, wchar_t * int text_size = (int)mir_wstrlen(szText);
// Call service for the first time to see if needs to be used...
- SMADD_BATCHPARSE2 sp = {};
- sp.cbSize = sizeof(sp);
+ SMADD_BATCHPARSE sp = {};
sp.hContact = pdnce->hContact;
if (dat->text_use_protocol_smileys) {
@@ -198,8 +197,8 @@ void CSmileyString::ReplaceSmileys(ClcData *dat, ClcCacheEntry *pdnce, wchar_t * }
else sp.Protocolname = "clist";
- sp.str = szText;
- sp.flag = SAFL_TCHAR;
+ sp.str.w = szText;
+ sp.flag = SAFL_UNICODE;
SMADD_BATCHPARSERES *spr = (SMADD_BATCHPARSERES*)CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&sp);
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index fecf90b3c5..2e9646681d 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -1604,10 +1604,8 @@ static int clcHookModulesLoaded(WPARAM, LPARAM) // Register smiley category
if (ServiceExists(MS_SMILEYADD_REGISTERCATEGORY)) {
SMADD_REGCAT rc;
- rc.cbSize = sizeof(rc);
rc.name = "clist";
rc.dispname = Translate("Contact list smileys");
-
CallService(MS_SMILEYADD_REGISTERCATEGORY, 0, (LPARAM)&rc);
HookEvent(ME_SMILEYADD_OPTIONSCHANGED, clcHookSmileyAddOptionsChanged);
|