diff options
author | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
commit | d0ceb5768ff3146499a0318ffe03c867c0845592 (patch) | |
tree | 984da5102d6a820e670323c47edd8187a37a0b33 /protocols/JabberG/src/jabber_xstatus.cpp | |
parent | 98ac258dc34b281e8441de847e37408c36c7415d (diff) |
- numerous name conflicts resolved;
- funny code that loads resource #102 from miranda32.exe removed;
- massive mir_sntprintf code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14979 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_xstatus.cpp')
-rw-r--r-- | protocols/JabberG/src/jabber_xstatus.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index 5c830ca8c2..1837898e5c 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -695,7 +695,7 @@ void CPepMood::SetMood(MCONTACT hContact, const TCHAR *szMood, const TCHAR *szTe if (m_proto->m_pInfoFrame) {
if (mood >= 0) {
- mir_sntprintf(title, _countof(title), TranslateT("Mood: %s"), TranslateTS(g_arrMoods[mood].szName));
+ mir_sntprintf(title, TranslateT("Mood: %s"), TranslateTS(g_arrMoods[mood].szName));
m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/mood", g_MoodIcons.GetIcolibHandle(g_arrMoods[mood].szTag), TranslateTS(g_arrMoods[mood].szName));
}
else {
@@ -1083,7 +1083,7 @@ void CPepActivity::SetActivity(MCONTACT hContact, LPCTSTR szFirst, LPCTSTR szSec if (m_proto->m_pInfoFrame) {
if (activity >= 0) {
- mir_sntprintf(title, _countof(title), TranslateT("Activity: %s"), activityTitle);
+ mir_sntprintf(title, TranslateT("Activity: %s"), activityTitle);
m_proto->m_pInfoFrame->UpdateInfoItem("$/PEP/activity", g_ActivityIcons.GetIcolibHandle(returnActivity(activity)), activityTitle);
}
else {
@@ -1211,10 +1211,10 @@ void CJabberProto::SetContactTune(MCONTACT hContact, LPCTSTR szArtist, LPCTSTR s li.ptszAlbum = (TCHAR*)szSource;
li.ptszTitle = (TCHAR*)szTitle;
li.ptszTrack = (TCHAR*)szTrack;
- szListeningTo = (TCHAR *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)_T("%title% - %artist%"), (LPARAM)&li);
+ szListeningTo = (TCHAR*)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)_T("%title% - %artist%"), (LPARAM)&li);
}
else {
- szListeningTo = (TCHAR *) mir_alloc(2048 * sizeof(TCHAR));
+ szListeningTo = (TCHAR*)mir_alloc(2048 * sizeof(TCHAR));
mir_sntprintf(szListeningTo, 2047, _T("%s - %s"), szTitle ? szTitle : _T(""), szArtist ? szArtist : _T(""));
}
@@ -1286,7 +1286,7 @@ INT_PTR __cdecl CJabberProto::OnSetListeningTo(WPARAM, LPARAM lParam) szTmp++;
}
}
- mir_sntprintf(szLengthInSec, _countof(szLengthInSec), _T("%d"), result);
+ mir_sntprintf(szLengthInSec, _T("%d"), result);
}
SendPepTune(szArtist, szLength ? szLengthInSec : NULL, szSource, szTitle, szTrack, NULL);
|