From cda1de4a64338e8d2bf71a41b595c1607c86ee9d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 22 Oct 2013 14:40:42 +0000
Subject: MS_* comes for services, ME_* - for events
git-svn-id: http://svn.miranda-ng.org/main/trunk@6585 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/WinterSpeak/src/SpeakAnnounce.cpp | 8 ++++----
plugins/WinterSpeak/src/m_speak.h | 4 ++--
plugins/WinterSpeak/src/main.cpp | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/plugins/WinterSpeak/src/SpeakAnnounce.cpp b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
index 43efb965d5..2b9855f61b 100644
--- a/plugins/WinterSpeak/src/SpeakAnnounce.cpp
+++ b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
@@ -23,7 +23,7 @@ void SpeakAnnounce::statusChange(DBCONTACTWRITESETTING *write_setting, HANDLE us
{
return;
}
-
+
// check if we just connected, and want to suppress status changes
if (!m_db.getStatusFlag(AnnounceDatabase::StatusFlag_SuppressConnect) && m_protocol_info.isDisabled((char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)user, 0)))
{
@@ -150,11 +150,11 @@ void SpeakAnnounce::protocolAck(ACKDATA *ack)
//------------------------------------------------------------------------------
void SpeakAnnounce::message(const std::wstring &sentence, HANDLE user)
{
- CallService(ME_SPEAK_MESSAGE, reinterpret_cast<LPARAM>(user), reinterpret_cast<WPARAM>(sentence.c_str()));
+ CallService(MS_SPEAK_MESSAGE, reinterpret_cast<LPARAM>(user), reinterpret_cast<WPARAM>(sentence.c_str()));
}
void SpeakAnnounce::status(const std::wstring &sentence, HANDLE user)
{
- CallService(ME_SPEAK_STATUS, reinterpret_cast<LPARAM>(user), reinterpret_cast<WPARAM>(sentence.c_str()));
+ CallService(MS_SPEAK_STATUS, reinterpret_cast<LPARAM>(user), reinterpret_cast<WPARAM>(sentence.c_str()));
}
//------------------------------------------------------------------------------
@@ -163,7 +163,7 @@ bool SpeakAnnounce::readMessage(HANDLE contact)
std::wstring title = m_user_info.nameString(contact) + L" (" + m_user_info.statusModeString(contact) + L"): ";
HWND window = NULL;
-
+
window = FindWindow(L"#32770", (title + TranslateW(L"Message Session")).c_str());
if (window)
{
diff --git a/plugins/WinterSpeak/src/m_speak.h b/plugins/WinterSpeak/src/m_speak.h
index d044b29595..3c0d418012 100644
--- a/plugins/WinterSpeak/src/m_speak.h
+++ b/plugins/WinterSpeak/src/m_speak.h
@@ -1,4 +1,4 @@
-#define ME_SPEAK_STATUS "Speak/Status"
-#define ME_SPEAK_MESSAGE "Speak/Message"
\ No newline at end of file
+#define MS_SPEAK_STATUS "Speak/Status"
+#define MS_SPEAK_MESSAGE "Speak/Message"
\ No newline at end of file
diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp
index 2bbd768ae9..56e7665459 100644
--- a/plugins/WinterSpeak/src/main.cpp
+++ b/plugins/WinterSpeak/src/main.cpp
@@ -66,7 +66,7 @@ int eventMessageAdded(WPARAM wParam, LPARAM lParam)
int protocolAck(WPARAM, LPARAM lParam)
{
g_speak_announce->protocolAck(reinterpret_cast<ACKDATA *>(lParam));
-
+
return 0;
}
@@ -117,8 +117,8 @@ extern "C" __declspec(dllexport) int Load(void)
g_speak_config = new SpeakConfig(g_hInst);
// expose to allow miranda + plugins to access my speak routines
- CreateServiceFunction(ME_SPEAK_STATUS, status);
- CreateServiceFunction(ME_SPEAK_MESSAGE, message);
+ CreateServiceFunction(MS_SPEAK_STATUS, status);
+ CreateServiceFunction(MS_SPEAK_MESSAGE, message);
}
if (!g_speak_announce)
--
cgit v1.2.3