diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-02 12:02:34 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-02 12:02:34 +0000 |
| commit | 71eabf9174e4829e85d84f1098ef0d70b3674300 (patch) | |
| tree | 4275d4c331032c306779faa97863b4ab25d8637a /protocols/JabberG/src/jabber_proto.cpp | |
| parent | a0bd83dbb96a4e45005fdab38fb7b3a17cdcb012 (diff) | |
- avatars' Folders settings moved to the "Avatars" section;
- TCHAR_STR_PARAM is replaced by %S (we don't need the ansi version)
git-svn-id: http://svn.miranda-ng.org/main/trunk@3830 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 7eeeb47a52..eb81e2002a 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -360,12 +360,12 @@ HANDLE CJabberProto::AddToListByJID(const TCHAR *newJid, DWORD flags) HANDLE hContact;
TCHAR* jid, *nick;
- Log("AddToListByJID jid = " TCHAR_STR_PARAM, newJid);
+ Log("AddToListByJID jid = %S", newJid);
if ((hContact=HContactFromJID(newJid)) == NULL) {
// not already there: add
jid = mir_tstrdup(newJid);
- Log("Add new jid to contact jid = " TCHAR_STR_PARAM, jid);
+ Log("Add new jid to contact jid = %S", jid);
hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0);
CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)m_szModuleName);
JSetStringT(hContact, "jid", jid);
@@ -473,7 +473,7 @@ int CJabberProto::Authorize(HANDLE hDbEvent) char *lastName = firstName + strlen(firstName) + 1;
char *jid = lastName + strlen(lastName) + 1;
- Log("Send 'authorization allowed' to " TCHAR_STR_PARAM, jid);
+ Log("Send 'authorization allowed' to %S", jid);
TCHAR *newJid = (dbei.flags & DBEF_UTF) ? mir_utf8decodeT(jid) : mir_a2t(jid);
@@ -485,7 +485,7 @@ int CJabberProto::Authorize(HANDLE hDbEvent) JABBER_LIST_ITEM *item;
if ((item = ListGetItemPtr(LIST_ROSTER, newJid)) == NULL || (item->subscription != SUB_BOTH && item->subscription != SUB_TO)) {
- Log("Try adding contact automatically jid = " TCHAR_STR_PARAM, jid);
+ Log("Try adding contact automatically jid = %S", jid);
if ((hContact = AddToListByJID(newJid, 0)) != NULL) {
// Trigger actual add by removing the "NotOnList" added by AddToListByJID()
// See AddToListByJID() and JabberDbSettingChanged().
@@ -1417,7 +1417,7 @@ int __cdecl CJabberProto::SendAwayMsg(HANDLE /*hContact*/, HANDLE /*hProcess*/, int __cdecl CJabberProto::SetAwayMsg(int status, const TCHAR *msg)
{
- Log("SetAwayMsg called, wParam=%d lParam=" TCHAR_STR_PARAM, status, msg);
+ Log("SetAwayMsg called, wParam=%d lParam=%S", status, msg);
EnterCriticalSection(&m_csModeMsgMutex);
|