From bf37d6655a27cc3ea5af5412c9717596c9d1c30f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 19 Jun 2015 18:18:13 +0000
Subject: timezone api migrated to mir_core

git-svn-id: http://svn.miranda-ng.org/main/trunk@14266 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber.cpp             | 2 --
 protocols/JabberG/src/jabber_iq_handlers.cpp | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'protocols/JabberG')

diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index caedaddab5..697dcfa3da 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -59,7 +59,6 @@ PLUGININFOEX pluginInfo = {
 };
 
 XML_API  xi;
-TIME_API tmi;
 
 CLIST_INTERFACE* pcli;
 FI_INTERFACE *FIP = NULL;
@@ -184,7 +183,6 @@ extern "C" int __declspec(dllexport) Load()
 {
 	// set the memory, lists & utf8 managers
 	mir_getXI(&xi);
-	mir_getTMI(&tmi);
 	mir_getLP(&pluginInfo);
 	mir_getCLI();
 
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index d239ae052c..c2b6dc5c67 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -393,7 +393,7 @@ BOOL CJabberProto::OnIqRequestTime(HXML, CJabberIqInfo *pInfo)
 	TCHAR stime[100];
 	TCHAR szTZ[10];
 
-	tmi.printDateTime(UTC_TIME_HANDLE, _T("I"), stime, SIZEOF(stime), 0);
+	TimeZone_PrintDateTime(UTC_TIME_HANDLE, _T("I"), stime, SIZEOF(stime), 0);
 
 	int nGmtOffset = GetGMTOffset();
 	mir_sntprintf(szTZ, SIZEOF(szTZ), _T("%+03d:%02d"), nGmtOffset / 60, nGmtOffset % 60);
@@ -401,7 +401,7 @@ BOOL CJabberProto::OnIqRequestTime(HXML, CJabberIqInfo *pInfo)
 	XmlNodeIq iq(_T("result"), pInfo);
 	HXML timeNode = iq << XCHILDNS(_T("time"), JABBER_FEAT_ENTITY_TIME);
 	timeNode << XCHILD(_T("utc"), stime); timeNode << XCHILD(_T("tzo"), szTZ);
-	LPCTSTR szTZName = tmi.getTzName(NULL);
+	LPCTSTR szTZName = TimeZone_GetName(NULL);
 	if (szTZName)
 		timeNode << XCHILD(_T("tz"), szTZName);
 	m_ThreadInfo->send(iq);
@@ -426,7 +426,7 @@ BOOL CJabberProto::OnIqProcessIqOldTime(HXML, CJabberIqInfo *pInfo)
 	XmlNodeIq iq(_T("result"), pInfo);
 	HXML queryNode = iq << XQUERY(JABBER_FEAT_ENTITY_TIME_OLD);
 	queryNode << XCHILD(_T("utc"), stime);
-	LPCTSTR szTZName = tmi.getTzName(NULL);
+	LPCTSTR szTZName = TimeZone_GetName(NULL);
 	if (szTZName)
 		queryNode << XCHILD(_T("tz"), szTZName);
 	queryNode << XCHILD(_T("display"), dtime);
-- 
cgit v1.2.3