From 2b5aaa321425c6309ed912f04badd79e27e9549e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 30 May 2012 13:03:49 +0000
Subject: further cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@231 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Weather/weather.cpp          |  1 -
 protocols/Weather/weather.h            |  4 ----
 protocols/Weather/weather_conv.cpp     | 18 ------------------
 protocols/Weather/weather_userinfo.cpp | 12 +-----------
 4 files changed, 1 insertion(+), 34 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Weather/weather.cpp b/protocols/Weather/weather.cpp
index b716aefa63..c0dc3c3373 100644
--- a/protocols/Weather/weather.cpp
+++ b/protocols/Weather/weather.cpp
@@ -238,7 +238,6 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 
 	// initialize global variables
 	InitVar();
-	InitUniConv();
 
 	// load options and set defaults
 	LoadOptions();
diff --git a/protocols/Weather/weather.h b/protocols/Weather/weather.h
index 047f408dd5..aee843f164 100644
--- a/protocols/Weather/weather.h
+++ b/protocols/Weather/weather.h
@@ -397,10 +397,6 @@ BOOL IsMyContact(HANDLE hContact);
 // functions in weather_conv.c
 BOOL is_number(char *s);
 
-extern unsigned lpcp;
-void InitUniConv(void);
-LPWSTR ConvToUnicode(LPCSTR str2);
-
 void GetTemp(TCHAR *tempchar, TCHAR *unit, TCHAR *str);
 void GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str);
 void GetPressure(TCHAR *tempchar, TCHAR *unit, TCHAR *str);
diff --git a/protocols/Weather/weather_conv.cpp b/protocols/Weather/weather_conv.cpp
index 1cf003e8e2..2bad50f0fa 100644
--- a/protocols/Weather/weather_conv.cpp
+++ b/protocols/Weather/weather_conv.cpp
@@ -642,21 +642,3 @@ TCHAR *GetError(int code)
 	}
 	return str;
 }
-
-LPWSTR ConvToUnicode(LPCSTR str2)
-{
-	const size_t nLength = MultiByteToWideChar(lpcp, 0, str2, -1, NULL, 0);
-	LPWSTR res = ( LPWSTR )mir_alloc(sizeof(WCHAR)*nLength);
-	MultiByteToWideChar(lpcp, 0, str2, -1, res, (int)nLength);
-	return res;
-}
-
-unsigned lpcp;
-
-void InitUniConv(void)
-{
-	lpcp = (unsigned)CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);
-	if (lpcp == CALLSERVICE_NOTFOUND || lpcp == GetUserDefaultLangID()) 
-		lpcp = CP_ACP;
-}
-
diff --git a/protocols/Weather/weather_userinfo.cpp b/protocols/Weather/weather_userinfo.cpp
index ba9ee83570..c0b196bf4d 100644
--- a/protocols/Weather/weather_userinfo.cpp
+++ b/protocols/Weather/weather_userinfo.cpp
@@ -363,17 +363,7 @@ void LoadBriefInfoText(HWND hwndDlg, HANDLE hContact)
 	else
 		// set the display text and show the message box
 		GetDisplay(&winfo, opt.bText, str);
-
-	if (lpcp != CP_ACP)
-	{
-		SETTEXTEX textex; 
-		textex.flags = ST_DEFAULT;
-		textex.codepage = lpcp;
-
-		SendMessage(GetDlgItem(hwndDlg, IDC_MTEXT), EM_SETTEXTEX, (WPARAM)&textex, (LPARAM)str);
-	}
-	else
-		SetDlgItemText(hwndDlg, IDC_MTEXT, str);
+	SetDlgItemText(hwndDlg, IDC_MTEXT, str);
 
 	GetDisplay(&winfo, opt.bTitle, str);
 	SetWindowText(hwndDlg, str);
-- 
cgit v1.2.3