From 10126b8ab2d030c8789525edcc87ff1c7c5b3e54 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 19 Dec 2016 17:32:21 +0300
Subject: unused parameter removed

---
 src/core/stdmsg/src/chat_window.cpp |  4 ++--
 src/core/stdmsg/src/stdafx.h        |  2 +-
 src/core/stdmsg/src/tabs.cpp        | 17 +++++++----------
 src/mir_app/src/chat_clist.cpp      |  2 +-
 src/mir_app/src/chat_svc.cpp        |  4 +---
 src/mir_app/src/chat_tools.cpp      |  2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index febbeb7a60..cb0c685987 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -218,7 +218,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 				if (g_Settings.bTabsEnable)
 					SendMessage(GetParent(GetParent(hwndDlg)), GC_SWITCHNEXTTAB, 0, 0);
 				else
-					pci->ShowRoom(SM_GetNextWindow(dat->si), WINDOW_VISIBLE, TRUE);
+					pci->ShowRoom(SM_GetNextWindow(dat->si));
 				return TRUE;
 			}
 
@@ -226,7 +226,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 				if (g_Settings.bTabsEnable)
 					SendMessage(GetParent(GetParent(hwndDlg)), GC_SWITCHPREVTAB, 0, 0);
 				else
-					pci->ShowRoom(SM_GetPrevWindow(dat->si), WINDOW_VISIBLE, TRUE);
+					pci->ShowRoom(SM_GetPrevWindow(dat->si));
 				return TRUE;
 			}
 
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 7fb974d23c..e1658bf1f4 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -139,7 +139,7 @@ HICON LoadIconEx(const char *pszIcoLibName, bool big);
 HANDLE GetIconHandle(const char *pszIcolibName);
 
 // services.cpp
-void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground);
+void ShowRoom(SESSION_INFO *si);
 
 // tools.cpp
 int  GetColorIndex(const char* pszModule, COLORREF cr);
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 6eb59da245..32fa470e83 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -252,7 +252,7 @@ void CTabbedWindow::TabClicked()
 
 		SendMessage(m_hwnd, GC_FIXTABICONS, 0, (LPARAM)pDlg);
 		if (!s->hWnd) {
-			pci->ShowRoom(s, WINDOW_VISIBLE, TRUE);
+			pci->ShowRoom(s);
 			SendMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0);
 		}
 	}
@@ -529,7 +529,7 @@ void UninitTabs()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL)
+void ShowRoom(SESSION_INFO *si)
 {
 	if (!si)
 		return;
@@ -559,14 +559,11 @@ void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL)
 	}
 
 	SetWindowLongPtr(si->hWnd, GWL_EXSTYLE, GetWindowLongPtr(si->hWnd, GWL_EXSTYLE) | WS_EX_APPWINDOW);
-	if (!IsWindowVisible(si->hWnd) || wp == WINDOW_HIDDEN)
-		SendMessage(si->hWnd, GC_CONTROL_MSG, wp, 0);
-	else {
-		if (IsIconic(si->hWnd))
-			ShowWindow(si->hWnd, SW_NORMAL);
-		ShowWindow(si->hWnd, SW_SHOW);
-		SetForegroundWindow(si->hWnd);
-	}
+
+	if (IsIconic(si->hWnd))
+		ShowWindow(si->hWnd, SW_NORMAL);
+	ShowWindow(si->hWnd, SW_SHOW);
+	SetForegroundWindow(si->hWnd);
 
 	SendMessage(si->hWnd, WM_MOUSEACTIVATE, 0, 0);
 	SetFocus(GetDlgItem(si->hWnd, IDC_MESSAGE));
diff --git a/src/mir_app/src/chat_clist.cpp b/src/mir_app/src/chat_clist.cpp
index 27268d8a8d..93346dd334 100644
--- a/src/mir_app/src/chat_clist.cpp
+++ b/src/mir_app/src/chat_clist.cpp
@@ -121,7 +121,7 @@ int RoomDoubleclicked(WPARAM hContact, LPARAM)
 			PostMessage(si->hWnd, GC_CLOSEWINDOW, 0, 0);
 			return 1;
 		}
-		chatApi.ShowRoom(si, WINDOW_VISIBLE, TRUE);
+		chatApi.ShowRoom(si);
 	}
 	return 1;
 }
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index edd6dab94e..6181e50b9c 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -299,8 +299,6 @@ static INT_PTR __stdcall stubRoomControl(void *param)
 		if (SESSION_INFO *si = chatApi.SM_FindSession(p->wszId, p->szModule)) {
 			SetInitDone(si);
 			chatApi.SetActiveSession(si->ptszID, si->pszModule);
-			if (si->hWnd)
-				chatApi.ShowRoom(si, p->command, FALSE);
 		}
 		return 0;
 
@@ -311,7 +309,7 @@ static INT_PTR __stdcall stubRoomControl(void *param)
 		if (SESSION_INFO *si = chatApi.SM_FindSession(p->wszId, p->szModule)) {
 			SetInitDone(si);
 			if (p->command != SESSION_INITDONE || db_get_b(NULL, CHAT_MODULE, "PopupOnJoin", 0) == 0)
-				chatApi.ShowRoom(si, p->command, TRUE);
+				chatApi.ShowRoom(si);
 			return 0;
 		}
 		break;
diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp
index 566e1c07e7..92031d6a4a 100644
--- a/src/mir_app/src/chat_tools.cpp
+++ b/src/mir_app/src/chat_tools.cpp
@@ -133,7 +133,7 @@ BOOL DoTrayIcon(SESSION_INFO *si, GCEVENT *gce)
 static void __stdcall ShowRoomFromPopup(void *pi)
 {
 	SESSION_INFO *si = (SESSION_INFO*)pi;
-	chatApi.ShowRoom(si, WINDOW_VISIBLE, TRUE);
+	chatApi.ShowRoom(si);
 }
 
 static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-- 
cgit v1.2.3