- fix for name conflict in proto helpers;

- switch to constants defined in m_nudge.h

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

2 files changed, 8 insertions, 8 deletions

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index ea6872ee57..d4f15ba995 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -458,7 +458,7 @@ LRESULT TSAPI DM_MsgWindowCmdHandler(HWND hwndDlg, TContainerData *m_pContainer,
 		CheckMenuItem(submenu, ID_SENDMENU_SENDWITHOUTTIMEOUTS, MF_BYCOMMAND | (dat->sendMode & SMODE_NOACK ? MF_CHECKED : MF_UNCHECKED));

 		{

 			const char *szFinalProto = dat->cache->getActiveProto();

-			EnableMenuItem(submenu, ID_SENDMENU_SENDNUDGE, MF_BYCOMMAND | ((ProtoServiceExists(szFinalProto, "/SendNudge") && ServiceExists(MS_NUDGE_SEND)) ? MF_ENABLED : MF_GRAYED));

+			EnableMenuItem(submenu, ID_SENDMENU_SENDNUDGE, MF_BYCOMMAND | ((ProtoServiceExists(szFinalProto, PS_SEND_NUDGE) && ServiceExists(MS_NUDGE_SEND)) ? MF_ENABLED : MF_GRAYED));

 		}

 		if (lParam)

 			iSelection = TrackPopupMenu(submenu, TPM_RETURNCMD, rc.left, rc.bottom, 0, hwndDlg, NULL);

@@ -787,7 +787,7 @@ void TSAPI DM_InitRichEdit(TWindowData *dat)
 	if (fIsChat) {

 		LOGFONTA lf;

 		LoadLogfont(MSGFONTID_MESSAGEAREA, &lf, &inputcharcolor, FONTMODULE);

-	

+

 		cf2.dwMask = CFM_COLOR | CFM_FACE | CFM_CHARSET | CFM_SIZE | CFM_WEIGHT | CFM_ITALIC | CFM_BACKCOLOR;

 		cf2.crTextColor = inputcharcolor;

 		cf2.bCharSet = lf.lfCharSet;

@@ -1062,7 +1062,7 @@ void TSAPI DM_UpdateLastMessage(const TWindowData *dat)
 		}

 		else szBuf[0] = 0;

 	}

-	

+

 	SendMessage(dat->pContainer->hwndStatus, SB_SETTEXT, 0, (LPARAM)szBuf);

 }

 

@@ -1288,7 +1288,7 @@ void TSAPI DM_NotifyTyping(struct TWindowData *dat, int mode)
 

 	if (!dat || !dat->hContact)

 		return;

-		

+

 	DeletePopupsForContact(dat->hContact, PU_REMOVE_ON_TYPE);

 

 	if (dat->bIsMeta){

@@ -1929,7 +1929,7 @@ void DrawStatusIcons(struct TWindowData *dat, HDC hDC, RECT r, int gap)
 	while (StatusIconData *si = Srmm_GetNthIcon(dat->hContact, nIcon++)) {

 		if ( !strcmp(si->szModule, MSG_ICON_MODULE)) {

 			if (si->dwId == MSG_ICON_SOUND) {

-				DrawIconEx(hDC, x, y, PluginConfig.g_buttonBarIcons[ICON_DEFAULT_SOUNDS], 

+				DrawIconEx(hDC, x, y, PluginConfig.g_buttonBarIcons[ICON_DEFAULT_SOUNDS],

 					cx_icon, cy_icon, 0, NULL, DI_NORMAL);

 

 				DrawIconEx(hDC, x, y, dat->pContainer->dwFlags & CNT_NOSOUND ?

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 2385b9fed7..11901b9fa6 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -2184,7 +2184,7 @@ void TSAPI EnableSendButton(const TWindowData *dat, int iMode)
 

 void TSAPI SendNudge(const TWindowData *dat)

 {

-	if ( ProtoServiceExists(dat->cache->getActiveProto(), "/SendNudge") && ServiceExists(MS_NUDGE_SEND))

+	if ( ProtoServiceExists(dat->cache->getActiveProto(), PS_SEND_NUDGE) && ServiceExists(MS_NUDGE_SEND))

 		CallService(MS_NUDGE_SEND, (WPARAM)dat->cache->getActiveContact(), 0);

 	else

 		SendMessage(dat->hwnd, DM_ACTIVATETOOLTIP, IDC_MESSAGE,

@@ -2374,11 +2374,11 @@ LONG TSAPI GetDefaultMinimumInputHeight(const TWindowData* dat)
 	LONG height = MINSPLITTERY;

 

 	if (dat) {

-		if (dat->bType == SESSIONTYPE_IM) 

+		if (dat->bType == SESSIONTYPE_IM)

 			height = ((dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR) ? DPISCALEY_S(46 + 22) : DPISCALEY_S(46));

 		else

 			height = ((dat->pContainer->dwFlags & CNT_BOTTOMTOOLBAR) ? DPISCALEY_S(22 + 46) : DPISCALEY_S(46)) - DPISCALEY_S(23);

-		

+

 		if (CSkin::m_skinEnabled && !SkinItems[ID_EXTBKINPUTAREA].IGNORED)

 			height += (SkinItems[ID_EXTBKINPUTAREA].MARGIN_BOTTOM + SkinItems[ID_EXTBKINPUTAREA].MARGIN_TOP - 2);

 	}