diff options
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_file.cpp | 6 | ||||
| -rwxr-xr-x | protocols/JabberG/src/stdafx.h | 1 |
2 files changed, 3 insertions, 4 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);
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h index 3fd27902d3..105e805d61 100755 --- a/protocols/JabberG/src/stdafx.h +++ b/protocols/JabberG/src/stdafx.h @@ -78,7 +78,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_protoint.h>
#include <m_skin.h>
#include <m_json.h>
-#include <m_string.h>
#include <m_timezones.h>
#include <m_toptoolbar.h>
#include <m_userinfo.h>
|