summaryrefslogtreecommitdiff
path: root/plugins/UserInfoEx
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-02-16 18:07:34 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-02-16 18:07:34 +0000
commitb3783bb50a312fa59d302aeede929377c18a6ec1 (patch)
tree30fafd914f38d378a3f472615a6cc3a9392e06e4 /plugins/UserInfoEx
parenta30dc859cf649443bf90da9ead7c110a63e7725e (diff)
timezone api extended to support global settings
git-svn-id: http://svn.miranda-ng.org/main/trunk@8139 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx')
-rw-r--r--plugins/UserInfoEx/src/ctrl_tzcombo.cpp4
-rw-r--r--plugins/UserInfoEx/src/svc_contactinfo.cpp2
-rw-r--r--plugins/UserInfoEx/src/svc_timezone.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
index dfa4084a83..9b4ffac422 100644
--- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
@@ -59,7 +59,7 @@ CBaseCtrl* CTzCombo::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
//set the adress of our timezone handle as itemdata
//caller can obtain the handle htz to extract all relevant information
ctrl->_curSel = 0;
- tmi.prepareList(NULL, hCtrl, TZF_PLF_CB);
+ tmi.prepareList(NULL, NULL, hCtrl, TZF_PLF_CB);
}
//fallback use old UIEX method
else {
@@ -206,7 +206,7 @@ void CTzCombo::OnApply(MCONTACT hContact, LPCSTR pszProto)
if (_Flags.B.hasCustom || !hContact) {
//use new core tz interface
if (tmi.storeListResults) {
- tmi.storeListResults(hContact, _hwnd, TZF_PLF_CB);
+ tmi.storeListResults(hContact, NULL, _hwnd, TZF_PLF_CB);
if (!hContact) {
_Flags.B.hasCustom = 0;
_Flags.B.hasProto = 1;
diff --git a/plugins/UserInfoEx/src/svc_contactinfo.cpp b/plugins/UserInfoEx/src/svc_contactinfo.cpp
index 7e98c90852..ed30f18c8d 100644
--- a/plugins/UserInfoEx/src/svc_contactinfo.cpp
+++ b/plugins/UserInfoEx/src/svc_contactinfo.cpp
@@ -565,7 +565,7 @@ INT_PTR GetContactInfo(WPARAM wParam, LPARAM lParam)
case CNF_TIMEZONE:
//use new core tz interface
if (tmi.prepareList) {
- HANDLE hTz = tmi.createByContact(ci->hContact, TZF_KNOWNONLY);
+ HANDLE hTz = tmi.createByContact(ci->hContact, 0, TZF_KNOWNONLY);
if (hTz) {
LPTIME_ZONE_INFORMATION tzi = tmi.getTzi(hTz);
int offset = tzi->Bias + tzi->StandardBias;
diff --git a/plugins/UserInfoEx/src/svc_timezone.cpp b/plugins/UserInfoEx/src/svc_timezone.cpp
index e1027f4b6a..8318e911bc 100644
--- a/plugins/UserInfoEx/src/svc_timezone.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone.cpp
@@ -41,7 +41,7 @@ INT_PTR GetContactTimeZoneInformation(WPARAM wParam,LPARAM lParam)
{
//use new core tz interface
LPTIME_ZONE_INFORMATION pTimeZoneInformation = (LPTIME_ZONE_INFORMATION)lParam;
- (*pTimeZoneInformation) = *tmi.getTzi(tmi.createByContact(wParam, 0));
+ (*pTimeZoneInformation) = *tmi.getTzi(tmi.createByContact(wParam, 0, 0));
return (pTimeZoneInformation == NULL);
}