code cleaning

10 files changed, 34 insertions, 10 deletions

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index 4af77123c5..39f4a1866d 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -338,7 +338,7 @@ void facebook_client::insert_reader(MCONTACT hContact, time_t timestamp, const s
 	parent->setDword(hContact, FACEBOOK_KEY_MESSAGE_READ, timestamp);
 	readers.insert(std::make_pair(hContact, timestamp));
 	parent->MessageRead(hContact);
-	if (ServiceExists(MS_MESSAGESTATE_UPDATE)) {
+	if (g_bMessageState) {
 		MessageReadData data(timestamp, MRD_TYPE_READTIME);
 		CallService(MS_MESSAGESTATE_UPDATE, hContact, (LPARAM)&data);
 	}
diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp
index 6503feee49..ec84f62346 100644
--- a/protocols/FacebookRM/src/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
@@ -26,6 +26,7 @@ CMPlugin g_plugin;
 

 std::string g_strUserAgent;

 DWORD g_mirandaVersion;

+bool g_bMessageState;

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

@@ -56,8 +57,18 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 /////////////////////////////////////////////////////////////////////////////////////////

 // Load

 

+static int OnModuleLoaded(WPARAM, LPARAM)

+{

+	g_bMessageState = ServiceExists(MS_MESSAGESTATE_UPDATE) != 0;

+	return 0;

+}

+

 int CMPlugin::Load()

 {

+	HookEvent(ME_SYSTEM_MODULELOAD, OnModuleLoaded);

+	HookEvent(ME_SYSTEM_MODULEUNLOAD, OnModuleLoaded);

+	OnModuleLoaded(0, 0);

+

 	InitIcons();

 	InitContactMenus();

 

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index b4eacb2407..fef127544d 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -1046,6 +1046,6 @@ void FacebookProto::MessageRead(MCONTACT hContact)
 		ptrW treaders(getWStringA(hContact, FACEBOOK_KEY_MESSAGE_READERS));
 		Srmm_SetStatusText(hContact, CMStringW(FORMAT, TranslateT("Message read: %s by %s"), ttime, treaders ? treaders : L"???"), hIcon);
 	}
-	else if (!ServiceExists(MS_MESSAGESTATE_UPDATE))
+	else if (!g_bMessageState)
 		Srmm_SetStatusText(hContact, CMStringW(FORMAT, TranslateT("Message read: %s"), ttime), hIcon);
 }
diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h
index 7c0815d6aa..9077ed184c 100644
--- a/protocols/FacebookRM/src/stdafx.h
+++ b/protocols/FacebookRM/src/stdafx.h
@@ -81,10 +81,11 @@ class FacebookProto;
 

 extern std::string g_strUserAgent;

 extern DWORD g_mirandaVersion;

+extern bool g_bMessageState;

 

 template <typename T>

 __inline static void FreeList(const LIST<T> &lst)

 {

 	for (auto &it : lst)

 		mir_free(it);

-}
\ No newline at end of file
+}

diff --git a/protocols/VKontakte/src/main.cpp b/protocols/VKontakte/src/main.cpp
index 8e2909bfa5..c304f57adb 100644
--- a/protocols/VKontakte/src/main.cpp
+++ b/protocols/VKontakte/src/main.cpp
@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "version.h"

 

 CMPlugin g_plugin;

+bool g_bMessageState;

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

@@ -49,8 +50,18 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 /////////////////////////////////////////////////////////////////////////////////////////

 // OnLoad - initialize the plugin instance

 

+static int OnModuleLoaded(WPARAM, LPARAM)

+{

+	g_bMessageState = ServiceExists(MS_MESSAGESTATE_UPDATE) != 0;

+	return 0;

+}

+

 int CMPlugin::Load()

 {

+	HookEvent(ME_SYSTEM_MODULELOAD, OnModuleLoaded);

+	HookEvent(ME_SYSTEM_MODULEUNLOAD, OnModuleLoaded);

+	OnModuleLoaded(0, 0);

+

 	InitIcons();

 	return 0;

 }

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 196f76f29f..582aa00481 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -701,7 +701,7 @@ void CVkProto::ContactTypingThread(void *p)
 	Sleep(4500);

 	CallService(MS_PROTO_CONTACTISTYPING, hContact);

 

-	if (!ServiceExists(MS_MESSAGESTATE_UPDATE)) {

+	if (!g_bMessageState) {

 		Sleep(1500);

 		SetSrmmReadStatus(hContact);

 	}

@@ -739,7 +739,7 @@ int CVkProto::OnProcessSrmmEvent(WPARAM, LPARAM lParam)
 	if (szProto.IsEmpty() || szProto != m_szModuleName)

 		return 0;

 

-	if (event->uType == MSG_WINDOW_EVT_OPENING && !ServiceExists(MS_MESSAGESTATE_UPDATE))

+	if (event->uType == MSG_WINDOW_EVT_OPENING && !g_bMessageState)

 		SetSrmmReadStatus(event->hContact);

 

 	if (event->uType == MSG_WINDOW_EVT_OPENING 	&& m_vkOptions.bLoadLastMessageOnMsgWindowsOpen

diff --git a/protocols/VKontakte/src/vk.h b/protocols/VKontakte/src/vk.h
index 77aed6241c..acc4ae940f 100644
--- a/protocols/VKontakte/src/vk.h
+++ b/protocols/VKontakte/src/vk.h
@@ -102,6 +102,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 struct CVkProto;

 extern mir_cs csInstances;

+extern bool g_bMessageState;

 

 LPCSTR findHeader(NETLIBHTTPREQUEST *hdr, LPCSTR szField);

 bool wlstrstr(wchar_t *_s1, wchar_t *_s2);

@@ -112,4 +113,4 @@ HANDLE GetIconHandle(int iCommand);
 char* ExpUrlEncode(const char *szUrl, bool strict = false);

 

 bool IsEmpty(LPCWSTR str);

-bool IsEmpty(LPCSTR str);
\ No newline at end of file
+bool IsEmpty(LPCSTR str);

diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index 2b3e00952b..2de3001185 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -309,7 +309,7 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
 

 	setDword(param->hContact, "lastmsgid", iLastMsgId);

 

-	if (ServiceExists(MS_MESSAGESTATE_UPDATE)) {

+	if (g_bMessageState) {

 		MessageReadData data(tLastReadMessageTime, MRD_TYPE_MESSAGETIME);

 		CallService(MS_MESSAGESTATE_UPDATE, param->hContact, (LPARAM)&data);

 	}

diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp
index 349cd997e7..35156eedcf 100644
--- a/protocols/VKontakte/src/vk_messages.cpp
+++ b/protocols/VKontakte/src/vk_messages.cpp
@@ -438,7 +438,7 @@ void CVkProto::OnReceiveDlgs(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
 			if (IsGroupUser(hContact))

 				szGroupIds.AppendFormat(szGroupIds.IsEmpty() ? "%d" : ",%d", -1 * uid);

 

-			if (ServiceExists(MS_MESSAGESTATE_UPDATE)) {

+			if (g_bMessageState) {

 				time_t tLastReadMessageTime = jnDlg["date"].as_int();

 				bool isOut = jnDlg["out"].as_bool();

 				bool isRead = jnDlg["read_state"].as_bool();

diff --git a/protocols/VKontakte/src/vk_pollserver.cpp b/protocols/VKontakte/src/vk_pollserver.cpp
index c023dd0825..5be1d266a8 100644
--- a/protocols/VKontakte/src/vk_pollserver.cpp
+++ b/protocols/VKontakte/src/vk_pollserver.cpp
@@ -101,7 +101,7 @@ void CVkProto::PollUpdates(const JSONNode &jnUpdates)
 

 			if (hContact != 0 && (flags & VKFLAG_MSGUNREAD) && !IsMessageExist(msgid, vkIN)) {

 				setDword(hContact, "LastMsgReadTime", time(0));

-				if (ServiceExists(MS_MESSAGESTATE_UPDATE)) {

+				if (g_bMessageState) {

 					MessageReadData data(time(0), MRD_TYPE_READTIME);

 					CallService(MS_MESSAGESTATE_UPDATE, hContact, (LPARAM)&data);

 				}

@@ -175,7 +175,7 @@ void CVkProto::PollUpdates(const JSONNode &jnUpdates)
 			hContact = FindUser(uid);

 			if (hContact != 0) {

 				setDword(hContact, "LastMsgReadTime", time(0));

-				if (ServiceExists(MS_MESSAGESTATE_UPDATE)) {

+				if (g_bMessageState) {

 					MessageReadData data(time(0), MRD_TYPE_READTIME);

 					CallService(MS_MESSAGESTATE_UPDATE, hContact, (LPARAM)&data);

 				}