diff options
| author | George Hazan <ghazan@miranda.im> | 2019-01-28 15:51:04 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-01-28 15:51:04 +0300 |
| commit | ac6607c5f76566c2c840ca3955a22448738df9b3 (patch) | |
| tree | b697dbe07b88ac8fefb5f00a003c95710b3bbbeb /protocols/JabberG/src/jabber_file.cpp | |
| parent | e787987f54733bd58f69ced43a506aa7fc42fb7c (diff) | |
mir_urlDecode & mir_urlEncode to return CMStringA
Diffstat (limited to 'protocols/JabberG/src/jabber_file.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_file.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index ec653ca3c1..4c77f434c0 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -279,8 +279,8 @@ void __cdecl CJabberProto::FileServerThread(filetransfer *ft) else
p = ft->std.pszFiles.w[i];
- ptrA pFileName(mir_urlEncode(T2Utf(p)));
- if (pFileName != nullptr) {
+ CMStringA pFileName(mir_urlEncode(T2Utf(p)));
+ if (!pFileName.IsEmpty()) {
ft->szId = JabberId2string(SerialNext());
ptrA myAddr;
@@ -294,7 +294,7 @@ void __cdecl CJabberProto::FileServerThread(filetransfer *ft) }
char szAddr[256];
- mir_snprintf(szAddr, "http://%s:%d/%s", myAddr, nlb.wPort, pFileName);
+ mir_snprintf(szAddr, "http://%s:%d/%s", myAddr, nlb.wPort, pFileName.c_str());
size_t len = mir_wstrlen(ptszResource) + mir_wstrlen(ft->jid) + 2;
wchar_t *fulljid = (wchar_t *)alloca(sizeof(wchar_t) * len);
|