diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-23 09:10:00 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-23 09:10:00 +0000 |
| commit | 2b7c50a79e27cc49a94df298176c67a0b602dc57 (patch) | |
| tree | 06be10abd19adf68493d1f1869b85ee7e76ed147 /protocols/JabberG/src | |
| parent | 5d9e715ec7957c0bb87eb9a858420ff8a6301fbb (diff) | |
also wrtrim renamed, according to the standard, to rtrimw
git-svn-id: http://svn.miranda-ng.org/main/trunk@4516 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index c36c5dd748..1e423ad091 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1510,7 +1510,7 @@ int CJabberProto::JabberGcEventHook(WPARAM, LPARAM lParam) switch (gch->pDest->iType) {
case GC_USER_MESSAGE:
if (gch->pszText && lstrlen(gch->ptszText) > 0) {
- trtrim(gch->ptszText);
+ rtrimt(gch->ptszText);
if (m_bJabberOnline) {
TCHAR* buf = NEWTSTR_ALLOCA(gch->ptszText);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 376dc3b7fc..a2a5745d28 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -296,7 +296,7 @@ LBL_Exit: db_free(&dbv);
}
- if (*trtrim(info->username) == '\0') {
+ if (*rtrimt(info->username) == '\0') {
DWORD dwSize = SIZEOF(info->username);
if (GetUserName(info->username, &dwSize))
JSetStringT(NULL, "LoginName", info->username);
@@ -304,7 +304,7 @@ LBL_Exit: info->username[0] = 0;
}
- if (*trtrim(info->username) == '\0') {
+ if (*rtrimt(info->username) == '\0') {
Log("Thread ended, login name is not configured");
JSendBroadcast(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_BADUSERID);
LBL_FatalError:
|