From cfd90c47ed918ccfb1cb57e5331a4e7a216ccf10 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Thu, 6 Dec 2012 20:49:39 +0000
Subject: added timezone description in own info

git-svn-id: http://svn.miranda-ng.org/main/trunk@2674 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Skype/src/skype.cpp         | 4 ++++
 protocols/Skype/src/skype.h           | 1 +
 protocols/Skype/src/skype_dialogs.cpp | 5 ++++-
 protocols/Skype/src/version.h         | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Skype/src/skype.cpp b/protocols/Skype/src/skype.cpp
index 7c19a055aa..9036db259b 100644
--- a/protocols/Skype/src/skype.cpp
+++ b/protocols/Skype/src/skype.cpp
@@ -3,6 +3,7 @@
 
 int hLangpack;
 HINSTANCE g_hInstance;
+TIME_API tmi = {0};
 
 CSkype* g_skype;
 
@@ -344,6 +345,9 @@ extern "C" int __declspec(dllexport) Load(void)
 	if (!StartSkypeRuntime())
 		return 1;
 
+	mir_getTMI(&tmi);
+	mir_getLP(&pluginInfo);
+
 	g_skype = new CSkype();
 	char *keyBuf = LoadKeyPair();
 	g_skype->init(keyBuf, "127.0.0.1", port);
diff --git a/protocols/Skype/src/skype.h b/protocols/Skype/src/skype.h
index e8ffe2b3b6..d2c18dadba 100644
--- a/protocols/Skype/src/skype.h
+++ b/protocols/Skype/src/skype.h
@@ -41,6 +41,7 @@
 //#include <m_hotkeys.h>
 //#pragma warning(pop)
 #include <win2k.h>
+#include <m_timezones.h>
 
 #include <io.h>
 #include <fcntl.h>
diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp
index 4e65d5a495..fa15d819c9 100644
--- a/protocols/Skype/src/skype_dialogs.cpp
+++ b/protocols/Skype/src/skype_dialogs.cpp
@@ -377,7 +377,10 @@ INT_PTR CALLBACK CSkypeProto::OwnSkypeDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 										text = L"Female";
 										break;
 									}
-								//} else if (!strcmp(setting[lvi.iItem].szDbSetting, "Timezone")) {
+								} else if (!strcmp(setting[lvi.iItem].szDbSetting, "Timezone")) {
+									HANDLE hTimeZone = tmi.createByContact ? tmi.createByContact(NULL, 0) : 0;
+									LPCTSTR TzDescr = tmi.getTzDescription(tmi.getTzName(hTimeZone));
+									text = mir_tstrdup(TzDescr);
 								} else {
 									wchar_t tmp[10];
 									_ltot(ppro->GetSettingByte(setting[lvi.iItem].szDbSetting), tmp, 10);
diff --git a/protocols/Skype/src/version.h b/protocols/Skype/src/version.h
index 281233e9ec..5cf0309a44 100644
--- a/protocols/Skype/src/version.h
+++ b/protocols/Skype/src/version.h
@@ -10,7 +10,7 @@
 #define __STRINGIFY(x)				__STRINGIFY_IMPL(x)
 #define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)
 
-#define __PLUGIN_NAME				"Skype Plugin"
+#define __PLUGIN_NAME				"Skype Protocol"
 #define __INTERNAL_NAME				"Skype"
 #define __FILENAME					"Skype.dll"
 #define __DESCRIPTION 				"Provides basic support for Skype protocol."
-- 
cgit v1.2.3