- fix for a nasty bug in tabSRMM popup headers;

- code cleaning

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

3 files changed, 8 insertions, 8 deletions

diff --git a/plugins/TabSRMM/src/chat/clist.cpp b/plugins/TabSRMM/src/chat/clist.cpp
index 7667cc7d7a..644fdf2338 100644
--- a/plugins/TabSRMM/src/chat/clist.cpp
+++ b/plugins/TabSRMM/src/chat/clist.cpp
@@ -68,7 +68,7 @@ HANDLE CList_AddRoom(const char* pszModule, const TCHAR* pszRoom, const TCHAR* p
 		return hContact;

 

 	// here we create a new one since no one is to be found

-	if ((hContact = (HANDLE) CallService(MS_DB_CONTACT_ADD, 0, 0)) == NULL)

+	if ((hContact = (HANDLE)CallService(MS_DB_CONTACT_ADD, 0, 0)) == NULL)

 		return NULL;

 

 	CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)pszModule);

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index 4af30980bb..e346526e08 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -446,7 +446,7 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT
 	else lstrcpyn(newcontactname, _T("_U_"), SIZEOF(newcontactname));

 

 	char *szProto = GetContactProto(newData.hContact);

-	WORD wStatus = (szProto == NULL) ? ID_STATUS_OFFLINE : db_get_w((HANDLE) newData.hContact, szProto, "Status", ID_STATUS_OFFLINE);

+	WORD wStatus = (szProto == NULL) ? ID_STATUS_OFFLINE : db_get_w((HANDLE)newData.hContact, szProto, "Status", ID_STATUS_OFFLINE);

 	char *szStatus = (char *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, 

 		(szProto == NULL) ? ID_STATUS_OFFLINE : db_get_w((HANDLE)newData.hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 0627872d04..7ba1c799db 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -260,7 +260,7 @@ static void Chat_UpdateWindowState(TWindowData *dat, UINT msg)
 	}

 

 #if defined(__FEAT_EXP_AUTOSPLITTER)

-	if (dat->fIsAutosizingInput && dat->iInputAreaHeight == -1) {

+	if (dat->bIsAutosizingInput && dat->iInputAreaHeight == -1) {

 		dat->iInputAreaHeight = 0;

 		SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_REQUESTRESIZE, 0, 0);

 	}

@@ -402,7 +402,7 @@ static int RoomWndResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc)
 	GetClientRect(hwndDlg, &rcTabs);

 	int TabHeight = rcTabs.bottom - rcTabs.top;

 

-	if (dat->fIsAutosizingInput)

+	if (dat->bIsAutosizingInput)

 		Utils::showDlgControl(hwndDlg, IDC_SPLITTERY, SW_HIDE);

 

 	if (si->iType != GCW_SERVER) {

@@ -493,7 +493,7 @@ static int RoomWndResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc)
 		urc->rcItem.top = urc->dlgNewSize.cy - si->iSplitterY + 3;

 		urc->rcItem.bottom = urc->dlgNewSize.cy; // - 1 ;

 

-		if (dat->fIsAutosizingInput)

+		if (dat->bIsAutosizingInput)

 			urc->rcItem.top -= DPISCALEY_S(1);

 

 		if (bBottomToolbar && bToolbar)

@@ -1885,7 +1885,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			dat->hwnd = hwndDlg;

 			si->hWnd = hwndDlg;

 			si->dat = dat;

-			dat->fIsAutosizingInput = IsAutoSplitEnabled(dat);

+			dat->bIsAutosizingInput = IsAutoSplitEnabled(dat);

 			dat->fLimitedUpdate = false;

 			dat->iInputAreaHeight = -1;

 			if (!dat->pContainer->settings->fPrivate)

@@ -1897,7 +1897,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					si->iSplitterY = g_Settings.iSplitterY;

 			}

 			#if defined(__FEAT_EXP_AUTOSPLITTER)

-				if (dat->fIsAutosizingInput)

+				if (dat->bIsAutosizingInput)

 					si->iSplitterY = GetDefaultMinimumInputHeight(dat);

 			#endif

 			dat->pWnd = 0;

@@ -3590,7 +3590,7 @@ LABEL_SHOWWINDOW:
 

 		TABSRMM_FireEvent(dat->hContact, hwndDlg, MSG_WINDOW_EVT_CLOSING, 0);

 

-		if (!dat->fIsAutosizingInput)

+		if (!dat->bIsAutosizingInput)

 			db_set_w(NULL, "Chat", "SplitterX", (WORD)g_Settings.iSplitterX);

 

 		if (dat->pContainer->settings->fPrivate && !IsAutoSplitEnabled(dat))