From 8a774c838b0902f6e8436c0c3d686070f5bf6400 Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Mon, 22 Jun 2015 17:36:07 +0000
Subject: Minor fixes for r14306

git-svn-id: http://svn.miranda-ng.org/main/trunk@14331 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/HistoryLinkListPlus/src/linklist_dlg.cpp |  4 ++--
 plugins/TabSRMM/src/chat/window.cpp              |  2 +-
 plugins/TabSRMM/src/msgdialog.cpp                |  2 +-
 src/core/stdchat/src/window.cpp                  | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
index edf22e89e2..103ca8b5d3 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
@@ -127,7 +127,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL); 
 			else {
 				bool openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF) != 0xFF;
-				Utils_OpenUrlT(link);
+				Utils_OpenUrlT(link,openNewWindow);
 			}
 			mir_free(link);
 			break;
@@ -157,7 +157,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				if (_tcsstr(link, _T("mailto:")) != NULL)
 					ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL); 
 				else
-					Utils_OpenUrlT(link);
+					Utils_OpenUrlT(link,false);
 				break;
 			case IDM_LINK_OPENNEW:
 				if (_tcsstr(link, _T("mailto:")) != NULL)
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index acd55b81c9..a37f241b9d 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -2632,7 +2632,7 @@ LABEL_SHOWWINDOW:
 									Utils_OpenUrlT(tr.lpstrText);
 									break;
 								case ID_CURR:
-									Utils_OpenUrlT(tr.lpstrText);
+									Utils_OpenUrlT(tr.lpstrText,false);
 									break;
 								case ID_COPY:
 									Utils::CopyToClipBoard(tr.lpstrText, hwndDlg);
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 464b9dda62..1d5a3f4f60 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -2037,7 +2037,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						break;
 
 					case IDM_OPENEXISTING:
-						Utils_OpenUrlT(tszUrl);
+						Utils_OpenUrlT(tszUrl,false);
 						break;
 
 					case IDM_COPYLINK:
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index 511c18c65b..d480705827 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -2052,7 +2052,9 @@ LABEL_SHOWWINDOW:
 						s->wState &= ~GC_EVENT_HIGHLIGHT;
 						s->wState &= ~STATE_TALK;
 						SendMessage(hwndDlg, GC_FIXTABICONS, 0, (LPARAM)s);
-			}	}	}
+					}
+				}
+			}
 
 			if (uMsg != WM_ACTIVATE)
 				SetFocus(GetDlgItem(hwndDlg,IDC_MESSAGE));
@@ -2175,12 +2177,10 @@ LABEL_SHOWWINDOW:
 					tr.chrg = cr;
 					tr.lpstrText = pszWord;
 					long iRes = SendDlgItemMessage(hwndDlg, IDC_LOG, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
-					if (iRes > 0) {
-						int iLen = (int)mir_tstrlen(pszWord)-1;
-						while (iLen >= 0 && _tcschr(szTrimString, pszWord[iLen])) {
+					if (iRes > 0)
+						for (size_t iLen = mir_tstrlen(pszWord)-1;_tcschr(szTrimString, pszWord[iLen]);iLen--)
 							pszWord[iLen] = 0;
-							iLen--;
-				}	}	}
+				}
 
 				uID = CreateGCMenu(hwndDlg, &hMenu, 1, pt, si, NULL, pszWord);
 				switch (uID) {
@@ -2268,7 +2268,7 @@ LABEL_SHOWWINDOW:
 								break;
 
 							case ID_CURR:
-								Utils_OpenUrlT(tr.lpstrText);
+								Utils_OpenUrlT(tr.lpstrText,false);
 								break;
 
 							case ID_COPY:
-- 
cgit v1.2.3