fixes for unicode fonts (fixed #18)

Weather sounds are moved to its own group


git-svn-id: http://svn.miranda-ng.org/main/trunk@1498 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 4 insertions, 4 deletions

diff --git a/protocols/Weather/weather.cpp b/protocols/Weather/weather.cpp
index feb928c8e0..75d93b621d 100644
--- a/protocols/Weather/weather.cpp
+++ b/protocols/Weather/weather.cpp
@@ -141,7 +141,7 @@ int WeatherInit(WPARAM wParam,LPARAM lParam)
 	AddMenuItems();

 

 	// timer for the first update

-	timerId = SetTimer(NULL, 0, 5000, (TIMERPROC)timerProc2);  // first update is 5 sec after load

+	timerId = SetTimer(NULL, 0, 5000, timerProc2);  // first update is 5 sec after load

 

 	// weather user detail

 	hHooks[0] = HookEvent(ME_USERINFO_INITIALISE, UserInfoInit);

@@ -210,7 +210,6 @@ extern "C" int __declspec(dllexport) Unload(void)
 

 extern "C" int __declspec(dllexport) Load(void) 

 {

-	PROTOCOLDESCRIPTOR pd = {0};

 	DWORD lastver;

 

 

@@ -258,6 +257,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	hUpdateMutex = CreateMutex(NULL, FALSE, NULL);

 

 	// register weather protocol

+	PROTOCOLDESCRIPTOR pd = {0};

 	pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE;

 	pd.szName = WEATHERPROTONAME;

 	pd.type = PROTOTYPE_PROTOCOL;

@@ -270,8 +270,8 @@ extern "C" int __declspec(dllexport) Load(void)
 	DBWriteContactSettingString(NULL, "KnownModules", "Weather Protocol", "Weather,WeatherCondition,Current");

 

 	// add sound event

-	SkinAddNewSoundEx("weatherupdated", NULL, LPGEN("Weather Condition Changed"));

-	SkinAddNewSoundEx("weatheralert", NULL, LPGEN("Weather Alert Issued"));

+	SkinAddNewSoundExT("weatherupdated", _T(WEATHERPROTONAME), LPGENT("Weather Condition Changed"));

+	SkinAddNewSoundExT("weatheralert", _T(WEATHERPROTONAME), LPGENT("Weather Alert Issued"));

 

 	// window needed for popup commands

 	TCHAR SvcFunc[100];