diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-07-21 19:55:01 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-07-21 19:55:01 +0000 |
| commit | 6a2fedd96df821afe5e9635ccb1f1f29bd2efc02 (patch) | |
| tree | f385f96d4d7a5efb20c08dc63478c0c24820cde1 | |
| parent | af912035d710d9c5743d6ff95ef3b7d422834dc7 (diff) | |
Jabber: vc2015 compilation fix. Need to test on servers with mod_archive support!!!
git-svn-id: http://svn.miranda-ng.org/main/trunk@14605 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/JabberG/src/jabber_archive.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_icolib.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_archive.cpp b/protocols/JabberG/src/jabber_archive.cpp index b7d29783ac..db6261ae42 100644 --- a/protocols/JabberG/src/jabber_archive.cpp +++ b/protocols/JabberG/src/jabber_archive.cpp @@ -296,7 +296,7 @@ void CJabberProto::OnIqResultGetCollection(HXML iqNode, CJabberIqInfo*) dbei.cbBlob = (DWORD)mir_strlen(szEventText);
dbei.flags = DBEF_READ + DBEF_UTF + from;
dbei.pBlob = szEventText;
- dbei.timestamp = tmStart + _ttol(tszSecs) - timezone;
+ dbei.timestamp = TimeZone_ToLocal(tmStart + _ttol(tszSecs));
if (!IsDuplicateEvent(hContact, dbei))
db_event_add(hContact, &dbei);
}
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp index aca69dc538..c2cb84c87e 100644 --- a/protocols/JabberG/src/jabber_icolib.cpp +++ b/protocols/JabberG/src/jabber_icolib.cpp @@ -525,10 +525,10 @@ static IconItem sharedIconList4[] = void g_IconsInit()
{
- Icon_Register(hInst, LPGEN("Protocols")"/"LPGEN("Jabber"), sharedIconList1, _countof(sharedIconList1), GLOBAL_SETTING_PREFIX);
- Icon_Register(hInst, LPGEN("Protocols")"/"LPGEN("Jabber")"/"LPGEN("Dialogs"), sharedIconList2, _countof(sharedIconList2), GLOBAL_SETTING_PREFIX);
- Icon_Register(hInst, LPGEN("Protocols")"/"LPGEN("Dialogs")"/"LPGEN("Discovery"), sharedIconList3, _countof(sharedIconList3), GLOBAL_SETTING_PREFIX);
- Icon_Register(hInst, LPGEN("Protocols")"/"LPGEN("Dialogs")"/"LPGEN("Privacy"), sharedIconList4, _countof(sharedIconList4), GLOBAL_SETTING_PREFIX);
+ Icon_Register(hInst, LPGEN("Protocols") "/" LPGEN("Jabber"), sharedIconList1, _countof(sharedIconList1), GLOBAL_SETTING_PREFIX);
+ Icon_Register(hInst, LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs"), sharedIconList2, _countof(sharedIconList2), GLOBAL_SETTING_PREFIX);
+ Icon_Register(hInst, LPGEN("Protocols") "/" LPGEN("Dialogs") "/" LPGEN("Discovery"), sharedIconList3, _countof(sharedIconList3), GLOBAL_SETTING_PREFIX);
+ Icon_Register(hInst, LPGEN("Protocols") "/" LPGEN("Dialogs") "/" LPGEN("Privacy"), sharedIconList4, _countof(sharedIconList4), GLOBAL_SETTING_PREFIX);
}
HANDLE g_GetIconHandle(int iconId)
|