- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

1 files changed, 5 insertions, 6 deletions

diff --git a/plugins/WinterSpeak/src/SpeakConfig.cpp b/plugins/WinterSpeak/src/SpeakConfig.cpp
index 40c9d48dbe..605b120f92 100644
--- a/plugins/WinterSpeak/src/SpeakConfig.cpp
+++ b/plugins/WinterSpeak/src/SpeakConfig.cpp
@@ -33,13 +33,13 @@ void SpeakConfig::update(Subject &subject)
 }

 

 //------------------------------------------------------------------------------

-bool SpeakConfig::status(const std::wstring &sentence, HANDLE user) {

+bool SpeakConfig::status(const std::wstring &sentence, HCONTACT user) {

 	return say(sentence, user, false);

 }

-bool SpeakConfig::message(const std::wstring &sentence, HANDLE user) {

+bool SpeakConfig::message(const std::wstring &sentence, HCONTACT user) {

 	return say(sentence, user, true);

 }

-bool SpeakConfig::say(const std::wstring &sentence, HANDLE user, bool message)

+bool SpeakConfig::say(const std::wstring &sentence, HCONTACT user, bool message)

 {

 	if (!m_tts.get()){

 		return false;

@@ -89,11 +89,10 @@ bool SpeakConfig::say(const std::wstring &sentence, HANDLE user, bool message)
 		// if its a user say, then check the users status

 		if (active)

 		{

-			if(message) {

+			if(message)

 				active = m_db.getActiveUser(user).message;

-			} else {

+			else

 				active = m_db.getActiveUser(user).status;

-			}

 		}

 	}