From 53ff16b147c30de05cd21e3f97b0ae0106dd9566 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Oct 2017 22:47:10 +0300 Subject: the whole idea of customizable colors in chat considered totally useless --- protocols/AimOscar/src/chat.cpp | 4 ---- protocols/Discord/src/proto.cpp | 4 ---- protocols/FacebookRM/src/proto.cpp | 4 ---- protocols/IRCG/src/ircproto.cpp | 4 ---- protocols/JabberG/src/jabber_proto.cpp | 4 ---- protocols/MSN/src/msn_proto.cpp | 4 ---- protocols/VKontakte/src/vk_proto.cpp | 6 +++--- 7 files changed, 3 insertions(+), 27 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp index 75940fdd18..79cb6d6af1 100644 --- a/protocols/AimOscar/src/chat.cpp +++ b/protocols/AimOscar/src/chat.cpp @@ -18,14 +18,10 @@ along with this program. If not, see . #include "stdafx.h" -static const COLORREF crCols[16] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 }; - void CAimProto::chat_register(void) { GCREGISTER gcr = {}; gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR; - gcr.nColors = 16; - gcr.pColors = (COLORREF*)crCols; gcr.ptszDispName = m_tszUserName; gcr.pszModule = m_szModuleName; Chat_Register(&gcr); diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp index a2550ec601..59fd938409 100644 --- a/protocols/Discord/src/proto.cpp +++ b/protocols/Discord/src/proto.cpp @@ -572,14 +572,10 @@ HANDLE CDiscordProto::SendFile(MCONTACT hContact, const wchar_t *szDescription, ///////////////////////////////////////////////////////////////////////////////////////// -static COLORREF crCols[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; - int CDiscordProto::OnModulesLoaded(WPARAM, LPARAM) { GCREGISTER gcr = {}; gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR; - gcr.nColors = _countof(crCols); - gcr.pColors = &crCols[0]; gcr.ptszDispName = m_tszUserName; gcr.pszModule = m_szModuleName; Chat_Register(&gcr); diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index ef239bd76b..281aad172a 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -451,14 +451,10 @@ int FacebookProto::OnModulesLoaded(WPARAM, LPARAM) // Register group chat GCREGISTER gcr = {}; - gcr.dwFlags = 0; //GC_ACKMSG; gcr.pszModule = m_szModuleName; gcr.ptszDispName = m_tszUserName; gcr.iMaxText = FACEBOOK_MESSAGE_LIMIT; - gcr.nColors = 0; - gcr.pColors = NULL; Chat_Register(&gcr); - return 0; } diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index de93e74c1f..85ea258941 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -156,8 +156,6 @@ CIrcProto::~CIrcProto() //////////////////////////////////////////////////////////////////////////////////////// // OnModulesLoaded - performs hook registration -static COLORREF crCols[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; - static int sttCheckPerform(const char *szSetting, LPARAM lParam) { if (!_strnicmp(szSetting, "PERFORM:", 8)) { @@ -194,8 +192,6 @@ int CIrcProto::OnModulesLoaded(WPARAM, LPARAM) GCREGISTER gcr = {}; gcr.dwFlags = GC_CHANMGR | GC_BOLD | GC_ITALICS | GC_UNDERLINE | GC_COLOR | GC_BKGCOLOR; - gcr.nColors = 16; - gcr.pColors = colors; gcr.ptszDispName = m_tszUserName; gcr.pszModule = m_szModuleName; Chat_Register(&gcr); diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 3194c2a93e..e6a7ab5ba3 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -200,8 +200,6 @@ CJabberProto::~CJabberProto() //////////////////////////////////////////////////////////////////////////////////////// // OnModulesLoadedEx - performs hook registration -static COLORREF crCols[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; - int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM) { HookProtoEvent(ME_USERINFO_INITIALISE, &CJabberProto::OnUserInfoInit); @@ -212,8 +210,6 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM) GCREGISTER gcr = {}; gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR; - gcr.nColors = _countof(crCols); - gcr.pColors = &crCols[0]; gcr.ptszDispName = m_tszUserName; gcr.pszModule = m_szModuleName; Chat_Register(&gcr); diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index dbce865552..ac9a861cf7 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -21,8 +21,6 @@ along with this program. If not, see . #include "stdafx.h" #include "msn_proto.h" -static COLORREF crCols[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; - int msn_httpGatewayInit(HNETLIBCONN hConn, NETLIBOPENCONNECTION *nloc, NETLIBHTTPREQUEST *nlhr); int msn_httpGatewayWrapSend(HNETLIBCONN hConn, PBYTE buf, int len, int flags); PBYTE msn_httpGatewayUnwrapRecv(NETLIBHTTPREQUEST *nlhr, PBYTE buf, int len, int *outBufLen, void *(*)(void*, size_t)); @@ -186,8 +184,6 @@ int CMsnProto::OnModulesLoaded(WPARAM, LPARAM) GCREGISTER gcr = {}; gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR; gcr.iMaxText = 0; - gcr.nColors = _countof(crCols); - gcr.pColors = crCols; gcr.ptszDispName = m_tszUserName; gcr.pszModule = m_szModuleName; Chat_Register(&gcr); diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 0edae1c719..99a0cdf0d0 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -31,7 +31,6 @@ static int sttCompareAsyncHttpRequest(const AsyncHttpRequest *p1, const AsyncHtt LIST vk_Instances(1, sttCompareProtocols); mir_cs csInstances; -static COLORREF sttColors[] = { 0, 1, 2, 3, 4, 5, 6 }; CVkProto::CVkProto(const char *szModuleName, const wchar_t *pwszUserName) : PROTO(szModuleName, pwszUserName), @@ -109,17 +108,18 @@ int CVkProto::OnModulesLoaded(WPARAM, LPARAM) GCREGISTER gcr = {}; gcr.ptszDispName = m_tszUserName; gcr.pszModule = m_szModuleName; - gcr.nColors = _countof(sttColors); - gcr.pColors = sttColors; Chat_Register(&gcr); + CreateProtoService(PS_LEAVECHAT, &CVkProto::OnLeaveChat); CreateProtoService(PS_JOINCHAT, &CVkProto::OnJoinChat); HookProtoEvent(ME_GC_EVENT, &CVkProto::OnChatEvent); HookProtoEvent(ME_GC_BUILDMENU, &CVkProto::OnGcMenuHook); + // Other hooks HookProtoEvent(ME_MSG_WINDOWEVENT, &CVkProto::OnProcessSrmmEvent); HookProtoEvent(ME_DB_EVENT_MARKED_READ, &CVkProto::OnDbEventRead); HookProtoEvent(ME_DB_CONTACT_SETTINGCHANGED, &CVkProto::OnDbSettingChanged); + //Sounds Skin_AddSound("VKNewsFeed", m_tszUserName, LPGENW("VKontakte newsfeed & notification event")); -- cgit v1.2.3