From 50c2fbbb1f7f6f233c980d7e4a52151fb72820f7 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 9 May 2021 18:45:30 +0300
Subject: suddenly: tipper services were used as string constants

(cherry picked from commit 15fcbbc128178ea5a4cdb1a58927a43ea740be88)
---
 protocols/JabberG/src/jabber_svc.cpp   | 2 +-
 protocols/JabberG/src/stdafx.h         | 1 +
 protocols/Weather/src/stdafx.h         | 1 +
 protocols/Weather/src/weather_mwin.cpp | 5 +----
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'protocols')

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index f7ef22bb29..1ec3c80106 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -344,7 +344,7 @@ INT_PTR __cdecl CJabberProto::JabberGCGetToolTipText(WPARAM wParam, LPARAM lPara
 	// Role:		Moderator
 	// Affiliation:  Affiliation
 
-	bool bIsTipper = ServiceExists("mToolTip/HideTip");
+	bool bIsTipper = ServiceExists(MS_TIPPER_HIDETIP);
 
 	//JID:
 	CMStringW outBuf;
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index 6fece86135..30263973f0 100755
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -81,6 +81,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_skin.h>
 #include <m_srmm_int.h>
 #include <m_timezones.h>
+#include <m_tipper.h>
 #include <m_toptoolbar.h>
 #include <m_userinfo.h>
 #include <m_utils.h>
diff --git a/protocols/Weather/src/stdafx.h b/protocols/Weather/src/stdafx.h
index 82bbbdaa87..bd4cddffbe 100644
--- a/protocols/Weather/src/stdafx.h
+++ b/protocols/Weather/src/stdafx.h
@@ -55,6 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_popup.h>
 #include <m_acc.h>
 
+#include <m_tipper.h>
 #include <m_weather.h>
 #include <m_toptoolbar.h>
 
diff --git a/protocols/Weather/src/weather_mwin.cpp b/protocols/Weather/src/weather_mwin.cpp
index 27c6664a1e..a1cfff3ddd 100644
--- a/protocols/Weather/src/weather_mwin.cpp
+++ b/protocols/Weather/src/weather_mwin.cpp
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
 
-#define MS_TOOLTIP_SHOWTIP		"mToolTip/ShowTip"
-#define MS_TOOLTIP_HIDETIP		"mToolTip/HideTip"
-
 static MWindowList hMwinWindowList;
 static HANDLE hFontHook;
 
@@ -95,7 +92,7 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 			ti.hItem = (HANDLE)data->hContact;
 			ti.ptCursor = pt;
 			ti.isTreeFocused = 1;
-			CallService(MS_TOOLTIP_SHOWTIP, 0, (LPARAM)&ti);
+			CallService(MS_TIPPER_SHOWTIP, 0, (LPARAM)&ti);
 		}
 		break;
 
-- 
cgit v1.2.3