- "Disable animated GIF avatars" setting removed;

- forgotten field TWindowData::hwndFlash also removed;
- boolean variables renamed to be boolean

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

12 files changed, 50 insertions, 56 deletions

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index de867aad1e..7af8ac71ff 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -579,7 +579,7 @@ BOOL TSAPI BB_SetButtonsPos(TWindowData *dat)
 	int iOff = DPISCALEY_S((PluginConfig.g_DPIscaleY > 1.0) ? (dat->bType == SESSIONTYPE_IM ? 22 : 23) : 22);

 

 	int foravatar = 0;

-	if ((rect.bottom - ptSplitter.y - (rcSplitter.bottom - rcSplitter.top) /*- DPISCALEY(2)*/ - (bBottomToolbar ? DPISCALEY_S(24) : 0) < dat->pic.cy - DPISCALEY_S(2)) && dat->showPic && !PluginConfig.m_AlwaysFullToolbarWidth)

+	if ((rect.bottom - ptSplitter.y - (rcSplitter.bottom - rcSplitter.top) /*- DPISCALEY(2)*/ - (bBottomToolbar ? DPISCALEY_S(24) : 0) < dat->pic.cy - DPISCALEY_S(2)) && dat->bShowAvatar && !PluginConfig.m_AlwaysFullToolbarWidth)

 		foravatar = dat->pic.cx + gap;

 

 	if ((dat->pContainer->dwFlags & CNT_SIDEBAR) && (dat->pContainer->SideBar->getFlags() & CSideBar::SIDEBARORIENTATION_LEFT)) {

diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp
index e62da197aa..0ae33e8a60 100644
--- a/plugins/TabSRMM/src/controls.cpp
+++ b/plugins/TabSRMM/src/controls.cpp
@@ -457,7 +457,7 @@ void CMenuBar::updateState(const HMENU hMenu) const
 	if (dat) {

 		::CheckMenuItem(hMenu, ID_VIEW_SHOWMENUBAR, MF_BYCOMMAND | m_pContainer->dwFlags & CNT_NOMENUBAR ? MF_UNCHECKED : MF_CHECKED);

 		::CheckMenuItem(hMenu, ID_VIEW_SHOWSTATUSBAR, MF_BYCOMMAND | m_pContainer->dwFlags & CNT_NOSTATUSBAR ? MF_UNCHECKED : MF_CHECKED);

-		::CheckMenuItem(hMenu, ID_VIEW_SHOWAVATAR, MF_BYCOMMAND | dat->showPic ? MF_CHECKED : MF_UNCHECKED);

+		::CheckMenuItem(hMenu, ID_VIEW_SHOWAVATAR, MF_BYCOMMAND | dat->bShowAvatar ? MF_CHECKED : MF_UNCHECKED);

 		::CheckMenuItem(hMenu, ID_VIEW_SHOWTITLEBAR, MF_BYCOMMAND | m_pContainer->dwFlags & CNT_NOTITLE ? MF_UNCHECKED : MF_CHECKED);

 

 		::EnableMenuItem(hMenu, ID_VIEW_SHOWTITLEBAR, CSkin::m_skinEnabled && CSkin::m_frameSkins ? MF_GRAYED : MF_ENABLED);

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 3294c0b866..b7c5283134 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1373,8 +1373,8 @@ void TSAPI DM_OptionsApplied(TWindowData *dat, WPARAM wParam, LPARAM lParam)
 	if (!lParam)
 		SendMessage(hwndDlg, DM_REMAKELOG, 0, 0);
 
-	ShowWindow(dat->hwndPanelPicParent, PluginConfig.g_bDisableAniAvatars ? SW_HIDE : SW_SHOW);
-	EnableWindow(dat->hwndPanelPicParent, PluginConfig.g_bDisableAniAvatars ? FALSE : TRUE);
+	ShowWindow(dat->hwndPanelPicParent, SW_SHOW);
+	EnableWindow(dat->hwndPanelPicParent, TRUE);
 
 	SendMessage(hwndDlg, DM_UPDATEWINICON, 0, 0);
 }
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index b2c5a7efa7..af15b69eac 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -235,7 +235,6 @@ void CGlobals::reloadSettings(bool fReloadSkins)
 

 void CGlobals::reloadAdv()

 {

-	g_bDisableAniAvatars = M.GetByte("adv_DisableAniAvatars", 0);

 	g_bSoundOnTyping = M.GetByte("adv_soundontyping", 0);

 	m_dontUseDefaultKbd = M.GetByte("adv_leaveKeyboardAlone", 1);

 

diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index c2d41ae5b1..b709c0b754 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -113,7 +113,6 @@ public:
    BOOL        g_bSoundOnTyping;

    BOOL        m_AllowTab;

    BYTE        m_AllowOfflineMultisend;

-   BOOL        g_bDisableAniAvatars;

    HBITMAP     m_hbmMsgArea;

    BYTE        g_iButtonsBarGap;

    BYTE        m_WinVerMajor;

diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp
index a160beeb24..6d667bd671 100644
--- a/plugins/TabSRMM/src/infopanel.cpp
+++ b/plugins/TabSRMM/src/infopanel.cpp
@@ -174,7 +174,7 @@ void CInfoPanel::showHide() const
 	HWND hwndDlg = m_dat->hwnd;

 

 	if (!m_isChat) {

-		::ShowWindow(m_dat->hwndPanelPicParent, m_active && (m_dat->hwndPanelPic || m_dat->hwndFlash) ? SW_SHOW : SW_HIDE);

+		::ShowWindow(m_dat->hwndPanelPicParent, m_active && m_dat->hwndPanelPic ? SW_SHOW : SW_HIDE);

 

 		m_dat->iRealAvatarHeight = 0;

 		::AdjustBottomAvatarDisplay(m_dat);

@@ -1009,7 +1009,7 @@ LRESULT CALLBACK CInfoPanel::avatarParentSubclass(HWND hwnd, UINT msg, WPARAM wP
 

 		GetClientRect(hwnd, &rcItem);

 		rc = rcItem;

-		if (!IsWindowEnabled(hwnd) || !dat->Panel->isActive() || dat->showInfoPic == 0)

+		if (!IsWindowEnabled(hwnd) || !dat->Panel->isActive() || !dat->bShowInfoAvatar)

 			return TRUE;

 

 		HDC dcWin = (HDC)wParam;

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index bc2d36bf19..9537721493 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -461,7 +461,7 @@ void TSAPI SetDialogToType(HWND hwndDlg)
 	DM_RecalcPictureSize(dat);

 	GetAvatarVisibility(hwndDlg, dat);

 

-	Utils::showDlgControl(hwndDlg, IDC_CONTACTPIC, dat->showPic ? SW_SHOW : SW_HIDE);

+	Utils::showDlgControl(hwndDlg, IDC_CONTACTPIC, dat->bShowAvatar ? SW_SHOW : SW_HIDE);

 	Utils::showDlgControl(hwndDlg, IDC_SPLITTER, dat->bIsAutosizingInput ? SW_HIDE : SW_SHOW);

 	Utils::showDlgControl(hwndDlg, IDC_MULTISPLITTER, (dat->sendMode & SMODE_MULTIPLE) ? SW_SHOW : SW_HIDE);

 

@@ -1040,7 +1040,7 @@ static int MessageDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *
 		GetClientRect(GetDlgItem(hwndDlg, IDC_MESSAGE), &rc);

 		urc->rcItem.top -= dat->splitterY - dat->originalSplitterY;

 		urc->rcItem.left = urc->rcItem.right - (dat->pic.cx + 2);

-		if ((urc->rcItem.bottom - urc->rcItem.top) < (dat->pic.cy/* + 2*/) && dat->showPic) {

+		if ((urc->rcItem.bottom - urc->rcItem.top) < (dat->pic.cy/* + 2*/) && dat->bShowAvatar) {

 			urc->rcItem.top = urc->rcItem.bottom - dat->pic.cy;

 			dat->fMustOffset = true;

 		}

@@ -1073,7 +1073,7 @@ static int MessageDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *
 

 	case IDC_MESSAGE:

 		urc->rcItem.right = urc->dlgNewSize.cx;

-		if (dat->showPic)

+		if (dat->bShowAvatar)

 			urc->rcItem.right -= dat->pic.cx + 2;

 		urc->rcItem.top -= dat->splitterY - dat->originalSplitterY;

 		if (bBottomToolbar&&showToolbar)

@@ -1304,7 +1304,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				dat->Panel->loadHeight();

 			}

 

-			dat->showPic = GetAvatarVisibility(hwndDlg, dat);

+			dat->bShowAvatar = GetAvatarVisibility(hwndDlg, dat);

 

 			RECT rc;

 			GetWindowRect(GetDlgItem(hwndDlg, IDC_SMILEYBTN), &rc);

@@ -1639,7 +1639,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			rc.right = cx;

 			rc.bottom--;

 

-			if (dat->showInfoPic && (dat->hwndPanelPic || dat->hwndFlash)) {

+			if (dat->bShowInfoAvatar && dat->hwndPanelPic) {

 				SetWindowPos(dat->hwndPanelPicParent, HWND_TOP, rc.left - 2, rc.top, rc.right - rc.left, (rc.bottom - rc.top) + 1, 0);

 				ShowWindow(dat->hwndPanelPicParent, (dat->panelWidth == -1) || !dat->Panel->isActive() ? SW_HIDE : SW_SHOW);

 			}

@@ -2645,7 +2645,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			if (PtInRect(&rcPicture, pt))

 				menuID = MENU_PICMENU;

 

-			if ((menuID == MENU_PICMENU && ((dat->ace ? dat->ace->hbmPic : PluginConfig.g_hbmUnknown) || dat->hOwnPic) && dat->showPic != 0)) {

+			if ((menuID == MENU_PICMENU && ((dat->ace ? dat->ace->hbmPic : PluginConfig.g_hbmUnknown) || dat->hOwnPic) && dat->bShowAvatar != 0)) {

 				HMENU submenu = GetSubMenu(m_pContainer->hMenuContext, menuID == MENU_PICMENU ? 1 : 11);

 				GetCursorPos(&pt);

 				MsgWindowUpdateMenu(dat, submenu, menuID);

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 62cdc862c5..7cefbf6f5f 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -549,49 +549,46 @@ bool TSAPI GetAvatarVisibility(HWND hwndDlg, TWindowData *dat)
 	char hideOverride = (char)M.GetByte(dat->hContact, "hideavatar", -1);

 

 	// infopanel visible, consider own avatar display

-	dat->showPic = 0;

+	dat->bShowAvatar = false;

 

 	if (dat->Panel->isActive() && bAvatarMode != 3) {

-		if (bOwnAvatarMode)

-			dat->showPic = false;

-		else {

-			dat->showPic = (dat->hOwnPic && dat->hOwnPic != PluginConfig.g_hbmUnknown) ? 1 : 0;

-			if (!PluginConfig.g_bDisableAniAvatars && !dat->hwndContactPic)

+		if (!bOwnAvatarMode) {

+			dat->bShowAvatar = (dat->hOwnPic && dat->hOwnPic != PluginConfig.g_hbmUnknown);

+			if (!dat->hwndContactPic)

 				dat->hwndContactPic = CreateWindowEx(WS_EX_TOPMOST, AVATAR_CONTROL_CLASS, _T(""), WS_VISIBLE | WS_CHILD, 1, 1, 1, 1, GetDlgItem(hwndDlg, IDC_CONTACTPIC), (HMENU)0, NULL, NULL);

 		}

 

 		switch (bAvatarMode) {

 		case 2:

-			dat->showInfoPic = 0;

+			dat->bShowInfoAvatar = false;

 			break;

 		case 0:

-			dat->showInfoPic = 1;

+			dat->bShowInfoAvatar = true;

 		case 1:

 			HBITMAP hbm = ((dat->ace && !(dat->ace->dwFlags & AVS_HIDEONCLIST)) ? dat->ace->hbmPic : 0);

-

-			if (0 == hbm && 0 == bAvatarMode && !PluginConfig.g_bDisableAniAvatars) {

-				dat->showInfoPic = 0;

+			if (hbm == NULL && !bAvatarMode) {

+				dat->bShowInfoAvatar = false;

 				break;

 			}

 

-			if (!PluginConfig.g_bDisableAniAvatars && !dat->hwndPanelPic) {

+			if (!dat->hwndPanelPic) {

 				dat->hwndPanelPic = CreateWindowEx(WS_EX_TOPMOST, AVATAR_CONTROL_CLASS, _T(""), WS_VISIBLE | WS_CHILD, 1, 1, 1, 1, dat->hwndPanelPicParent, (HMENU)7000, NULL, NULL);

 				if (dat->hwndPanelPic)

 					SendMessage(dat->hwndPanelPic, AVATAR_SETAEROCOMPATDRAWING, 0, TRUE);

 			}

 

 			if (bAvatarMode != 0)

-				dat->showInfoPic = (hbm && hbm != PluginConfig.g_hbmUnknown);

+				dat->bShowInfoAvatar = (hbm && hbm != PluginConfig.g_hbmUnknown);

 			break;

 		}

 

-		if (dat->showInfoPic)

-			dat->showInfoPic = hideOverride == 0 ? 0 : dat->showInfoPic;

+		if (dat->bShowInfoAvatar)

+			dat->bShowInfoAvatar = hideOverride == 0 ? false : dat->bShowInfoAvatar;

 		else

-			dat->showInfoPic = hideOverride == 1 ? 1 : dat->showInfoPic;

+			dat->bShowInfoAvatar = hideOverride == 1 ? true : dat->bShowInfoAvatar;

 

 		// reloads avatars

-		if (dat->showInfoPic) {

+		if (dat->bShowInfoAvatar) {

 			// panel and contact is shown, reloads contact's avatar -> panel

 			// user avatar -> bottom picture

 			Utils::setAvatarContact(dat->hwndPanelPic, dat->hContact);

@@ -605,40 +602,40 @@ bool TSAPI GetAvatarVisibility(HWND hwndDlg, TWindowData *dat)
 		}

 	}

 	else {

-		dat->showInfoPic = 0;

+		dat->bShowInfoAvatar = false;

 

 		switch (bAvatarMode) {

 		case 0: // globally on

-			dat->showPic = 1;

+			dat->bShowAvatar = true;

 			break;

 		case 2: // globally OFF

-			dat->showPic = 0;

+			dat->bShowAvatar = false;

 			break;

 		case 3: // on, if present

 		case 1:

 			HBITMAP hbm = (dat->ace && !(dat->ace->dwFlags & AVS_HIDEONCLIST)) ? dat->ace->hbmPic : 0;

 

-			if (!PluginConfig.g_bDisableAniAvatars && !dat->hwndContactPic)

+			if (!dat->hwndContactPic)

 				dat->hwndContactPic = CreateWindowEx(WS_EX_TOPMOST, AVATAR_CONTROL_CLASS, _T(""), WS_VISIBLE | WS_CHILD, 1, 1, 1, 1, GetDlgItem(hwndDlg, IDC_CONTACTPIC), (HMENU)0, NULL, NULL);

 

-			dat->showPic = (hbm && hbm != PluginConfig.g_hbmUnknown);

+			dat->bShowAvatar = (hbm && hbm != PluginConfig.g_hbmUnknown);

 			break;

 		}

 

-		if (dat->showPic)

-			dat->showPic = hideOverride == 0 ? 0 : dat->showPic;

+		if (dat->bShowAvatar)

+			dat->bShowAvatar = hideOverride == 0 ? 0 : dat->bShowAvatar;

 		else

-			dat->showPic = hideOverride == 1 ? 1 : dat->showPic;

+			dat->bShowAvatar = hideOverride == 1 ? 1 : dat->bShowAvatar;

 

 		// reloads avatars

-		if (dat->showPic)

+		if (dat->bShowAvatar)

 			if (dat->hwndPanelPic) // shows contact or user picture, depending on panel visibility

 				SendMessage(dat->hwndContactPic, AVATAR_SETPROTOCOL, 0, (LPARAM)dat->szProto);

 		

 		if (dat->hwndContactPic)

 			Utils::setAvatarContact(dat->hwndContactPic, dat->hContact);

 	}

-	return dat->showPic;

+	return dat->bShowAvatar;

 }

 

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

@@ -728,17 +725,17 @@ void TSAPI AdjustBottomAvatarDisplay(TWindowData *dat)
 

 		HBITMAP hbm = (bInfoPanel && dat->pContainer->avatarMode != 3) ? dat->hOwnPic : (dat->ace ? dat->ace->hbmPic : PluginConfig.g_hbmUnknown);

 		if (hbm) {

-			dat->showPic = GetAvatarVisibility(hwndDlg, dat);

+			dat->bShowAvatar = GetAvatarVisibility(hwndDlg, dat);

 			if (dat->dynaSplitter == 0 || dat->splitterY == 0)

 				LoadSplitter(dat);

 			dat->dynaSplitter = dat->splitterY - DPISCALEY_S(34);

 			DM_RecalcPictureSize(dat);

-			Utils::showDlgControl(hwndDlg, IDC_CONTACTPIC, dat->showPic ? SW_SHOW : SW_HIDE);

+			Utils::showDlgControl(hwndDlg, IDC_CONTACTPIC, dat->bShowAvatar ? SW_SHOW : SW_HIDE);

 			InvalidateRect(GetDlgItem(hwndDlg, IDC_CONTACTPIC), NULL, TRUE);

 		}

 		else {

-			dat->showPic = GetAvatarVisibility(hwndDlg, dat);

-			Utils::showDlgControl(hwndDlg, IDC_CONTACTPIC, dat->showPic ? SW_SHOW : SW_HIDE);

+			dat->bShowAvatar = GetAvatarVisibility(hwndDlg, dat);

+			Utils::showDlgControl(hwndDlg, IDC_CONTACTPIC, dat->bShowAvatar ? SW_SHOW : SW_HIDE);

 			dat->pic.cy = dat->pic.cx = DPISCALEY_S(60);

 			InvalidateRect(GetDlgItem(hwndDlg, IDC_CONTACTPIC), NULL, TRUE);

 		}

@@ -767,8 +764,8 @@ void TSAPI ShowPicture(TWindowData *dat, BOOL showNewPic)
 		AdjustBottomAvatarDisplay(dat);

 	}

 	else {

-		dat->showPic = dat->showPic ? 0 : 1;

-		db_set_b(dat->hContact, SRMSGMOD_T, "MOD_ShowPic", (BYTE)dat->showPic);

+		dat->bShowAvatar = dat->bShowAvatar ? 0 : 1;

+		db_set_b(dat->hContact, SRMSGMOD_T, "MOD_ShowPic", (BYTE)dat->bShowAvatar);

 	}

 	GetWindowRect(GetDlgItem(hwndDlg, IDC_CONTACTPIC), &rc);

 	if (dat->minEditBoxSize.cy + DPISCALEY_S(3) > dat->splitterY)

@@ -1613,7 +1610,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)
 	}

 	

 	HBITMAP hbmAvatar = dat->ace ? dat->ace->hbmPic : PluginConfig.g_hbmUnknown;

-	if ((dis->hwndItem == GetDlgItem(hwndDlg, IDC_CONTACTPIC) && dat->showPic) || (dis->hwndItem == hwndDlg && dat->Panel->isActive())) {

+	if ((dis->hwndItem == GetDlgItem(hwndDlg, IDC_CONTACTPIC) && dat->bShowAvatar) || (dis->hwndItem == hwndDlg && dat->Panel->isActive())) {

 		if (hbmAvatar == NULL)

 			return TRUE;

 

@@ -1630,7 +1627,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)
 		if (bPanelPic) {

 			GetObject(hbmAvatar, sizeof(bminfo), &bminfo);

 

-			if ((dat->ace && dat->showInfoPic && !(dat->ace->dwFlags & AVS_HIDEONCLIST)) || dat->showInfoPic)

+			if ((dat->ace && dat->bShowInfoAvatar && !(dat->ace->dwFlags & AVS_HIDEONCLIST)) || dat->bShowInfoAvatar)

 				aceFlags = dat->ace ? dat->ace->dwFlags : 0;

 			else {

 				if (dat->panelWidth) {

@@ -1745,7 +1742,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)
 			DeleteObject(hPenBorder);

 		}

 

-		if (((bDrawOwnAvatar ? dat->hOwnPic : hbmAvatar) && dat->showPic) || bPanelPic) {

+		if (((bDrawOwnAvatar ? dat->hOwnPic : hbmAvatar) && dat->bShowAvatar) || bPanelPic) {

 			HDC hdcMem = CreateCompatibleDC(dis->hDC);

 			HBITMAP hbmMem = 0;

 			if (bPanelPic) {

@@ -1761,7 +1758,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)
 				rb.max_width = (int)(dNewWidth - (bBorder ? 2 : 0));

 				rb.hBmp = hbmAvatar;

 

-				HBITMAP hbmNew = (HBITMAP)CallService("IMG/ResizeBitmap", (WPARAM)&rb, 0);

+				HBITMAP hbmNew = (HBITMAP)CallService(MS_IMG_RESIZE, (WPARAM)&rb, 0);

 				hbmMem = (HBITMAP)SelectObject(hdcMem, hbmNew);

 

 				rcFrame.left = rcFrame.top = 0;

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index b83f8ffeed..de04c3fe6f 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -397,7 +397,7 @@ int AvatarChanged(WPARAM wParam, LPARAM lParam)
 				DestroyIcon(dat->hTaskbarIcon);
 			dat->hTaskbarIcon = 0;
 			DM_RecalcPictureSize(dat);
-			if (dat->showPic == 0 || dat->showInfoPic == 0)
+			if (!dat->bShowAvatar || !dat->bShowInfoAvatar)
 				GetAvatarVisibility(hwnd, dat);
 			if (dat->hwndPanelPic) {
 				dat->panelWidth = -1;				// force new size calculations (not for flash avatars)
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index dad1e5dd68..3587f6c5e2 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -258,7 +258,7 @@ struct TWindowData
    HICON    iFlashIcon;

    BOOL     mayFlashTab;

    BOOL     bTabFlash;

-   HWND     hwndIEView, hwndFlash, hwndIWebBrowserControl, hwndHPP;

+   HWND     hwndIEView, hwndIWebBrowserControl, hwndHPP;

    HWND     hwndContactPic, hwndPanelPic, hwndPanelPicParent;

    UINT     bbLSideWidth;  //MAD

    UINT     bbRSideWidth;    //MAD

@@ -283,7 +283,7 @@ struct TWindowData
 	DWORD    dwTickLastEvent, dwUnread;

 	HBITMAP  hOwnPic;

 	SIZE     pic;

-	bool     showPic, showInfoPic;

+	bool     bShowAvatar, bShowInfoAvatar;

 	bool     fMustOffset;

 	bool     isHistory;

 	int      doSmileys;

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 3937a842a9..8dbc963588 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -2151,7 +2151,7 @@ HBITMAP CSkin::ResizeBitmap(HBITMAP hBmpSrc, LONG width, LONG height, bool &must
 		rb.max_width = width;

 		rb.hBmp = hBmpSrc;

 

-		HBITMAP hbmNew = (HBITMAP)CallService("IMG/ResizeBitmap", (WPARAM)&rb, 0);

+		HBITMAP hbmNew = (HBITMAP)CallService(MS_IMG_RESIZE, (WPARAM)&rb, 0);

 		if (hbmNew != hBmpSrc)

 			mustFree = true;

 		return(hbmNew);

diff --git a/plugins/TabSRMM/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp
index 5ae8b60173..a06caa7490 100644
--- a/plugins/TabSRMM/src/translator.cpp
+++ b/plugins/TabSRMM/src/translator.cpp
@@ -44,7 +44,6 @@ TOptionListItem m_lvItemsModPlus[] =
 {

 	{ 0, LPGENT("Show skinnable tooltip in chat (Tipper plugin required)"), 1, LOI_TYPE_SETTING, (UINT_PTR)"adv_TipperTooltip", 0 }, 

 	{ 0, LPGENT("Enable typing sounds"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_soundontyping", 0 }, 

-	{ 0, LPGENT("Disable animated GIF avatars (will not affect already open message windows)"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_DisableAniAvatars", 0 }, 

 	{ 0, LPGENT("Close current tab on send"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_AutoClose_2", 0 }, 

 	{ 0, LPGENT("Automatic keyboard layout: Do not load the system default for new contacts"), 1, LOI_TYPE_SETTING, (UINT_PTR)"adv_leaveKeyboardAlone", 0 }, 

 	{ 0, LPGENT("Enable unattended send (experimental feature, required for multisend and send later) (*)"), 0, LOI_TYPE_SETTING, (UINT_PTR)"sendLaterAvail", 0 },