diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-31 15:29:24 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-31 15:29:24 +0000 |
| commit | 9ac20243efe27f58501c59060a4f22c37104c0e3 (patch) | |
| tree | cf00f03c151d21e062a46f1a85eeb0be8a9342f2 /protocols/IcqOscarJ | |
| parent | 2738cf4311501acfc1b0e2de74b51b0edc18cdd2 (diff) | |
- PROTOCOLDESCRIPTOR_V3_SIZE to identify an ANSI plugin;
- absence of fnInitFunc to identify a protocol without instances;
- whole bunch of ansi crutches discarded
git-svn-id: http://svn.miranda-ng.org/main/trunk@13937 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_filerequests.cpp | 6 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/init.cpp | 3 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/oscar_filetransfer.cpp | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/protocols/IcqOscarJ/src/icq_filerequests.cpp b/protocols/IcqOscarJ/src/icq_filerequests.cpp index 9d6891dfb6..6dd10110d6 100644 --- a/protocols/IcqOscarJ/src/icq_filerequests.cpp +++ b/protocols/IcqOscarJ/src/icq_filerequests.cpp @@ -158,12 +158,12 @@ void CIcqProto::handleFileRequest(PBYTE buf, DWORD dwUin, DWORD dwCookie, DWORD pre.dwFlags = PRFF_TCHAR;
pre.fileCount = 1;
pre.timestamp = time(NULL);
- pre.tszDescription = mir_utf8decodeT(pszDescription);
- pre.ptszFiles = &ptszFileName;
+ pre.descr.t = mir_utf8decodeT(pszDescription);
+ pre.files.t = &ptszFileName;
pre.lParam = (LPARAM)ft;
ProtoChainRecvFile(hContact, &pre);
- mir_free(pre.tszDescription);
+ mir_free(pre.descr.t);
mir_free(ptszFileName);
}
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index 735b17bf80..a2d005fe47 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -102,7 +102,8 @@ extern "C" int __declspec(dllexport) Load(void) _tzset();
// Register the module
- PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
+ PROTOCOLDESCRIPTOR pd = { 0 };
+ pd.cbSize = sizeof(pd);
pd.szName = ICQ_PROTOCOL_NAME;
pd.type = PROTOTYPE_PROTOCOL;
pd.fnInit = icqProtoInit;
diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp index a229dda6a3..cb070ec4bd 100644 --- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp @@ -505,12 +505,12 @@ void CIcqProto::handleRecvServMsgOFT(BYTE *buf, size_t wLen, DWORD dwUin, char * pre.dwFlags = PRFF_TCHAR;
pre.fileCount = 1;
pre.timestamp = time(NULL);
- pre.tszDescription = mir_utf8decodeT(pszDescription);
- pre.ptszFiles = &ptszFileName;
+ pre.descr.t = mir_utf8decodeT(pszDescription);
+ pre.files.t = &ptszFileName;
pre.lParam = (LPARAM)ft;
ProtoChainRecvFile(hContact, &pre);
- mir_free(pre.tszDescription);
+ mir_free(pre.descr.t);
mir_free(ptszFileName);
}
else if (wAckType == 2) { // First attempt failed, reverse requested
|