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/IcqOscarJ/src/dlgproc.cpp  | 4 ++--
 protocols/IcqOscarJ/src/editlist.cpp | 4 ++--
 protocols/IcqOscarJ/src/init.cpp     | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'protocols/IcqOscarJ/src')

diff --git a/protocols/IcqOscarJ/src/dlgproc.cpp b/protocols/IcqOscarJ/src/dlgproc.cpp
index 517463bfd8..704764c848 100644
--- a/protocols/IcqOscarJ/src/dlgproc.cpp
+++ b/protocols/IcqOscarJ/src/dlgproc.cpp
@@ -77,8 +77,8 @@ char* ChangeInfoData::GetItemSettingText(int i, char *buf, size_t bufsize)
 
 				FieldNamesItem *list = (FieldNamesItem*)si.pList;
 				if (list == timezonesField) {
-					HANDLE tz = tmi.createByContact(NULL, ppro->m_szModuleName, 0);
-					text = make_utf8_string_static(tmi.getTzDescription(tmi.getTzName(tz)), buf, bufsize);
+					HANDLE tz = TimeZone_CreateByContact(NULL, ppro->m_szModuleName, 0);
+					text = make_utf8_string_static(TimeZone_GetDescription(TimeZone_GetName(tz)), buf, bufsize);
 					break;
 				}
 
diff --git a/protocols/IcqOscarJ/src/editlist.cpp b/protocols/IcqOscarJ/src/editlist.cpp
index da04c5efc1..df632256d5 100644
--- a/protocols/IcqOscarJ/src/editlist.cpp
+++ b/protocols/IcqOscarJ/src/editlist.cpp
@@ -99,7 +99,7 @@ void ChangeInfoData::BeginListEdit(int iItem, RECT *rc, int iSetting, WORD wVKey
 	}
 
 	if (list == timezonesField) {
-		tmi.prepareList(NULL, ppro->m_szModuleName, hwndListEdit, TZF_PLF_LB);
+		TimeZone_PrepareList(NULL, ppro->m_szModuleName, hwndListEdit, TZF_PLF_LB);
 	}
 	else {
 		int j, n = ListBoxAddStringUtf(hwndListEdit, "Unspecified");
@@ -149,7 +149,7 @@ void ChangeInfoData::EndListEdit(int save)
 		if (iItem != -1 && i != -1) {
 			FieldNamesItem *list = (FieldNamesItem*)si.pList;
 			if (list == timezonesField) {
-				tmi.storeListResults(NULL, ppro->m_szModuleName, hwndListEdit, TZF_PLF_LB);
+				TimeZone_StoreListResult(NULL, ppro->m_szModuleName, hwndListEdit, TZF_PLF_LB);
 				list[i = 0].code = ppro->getDword("Timezone", 0);
 			}
 
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index ddaec0e16c..e922d09cfa 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -30,7 +30,6 @@
 
 HINSTANCE hInst;
 int hLangpack;
-TIME_API tmi;
 CLIST_INTERFACE *pcli;
 bool g_bTerminated;
 
@@ -96,7 +95,6 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP(&pluginInfo);
 	mir_getCLI();
-	mir_getTMI(&tmi);
 
 	srand(time(NULL));
 	_tzset();
-- 
cgit v1.2.3