Utils_OpenUrlT

Utils_ReplaceVarsT

4 files changed, 9 insertions, 9 deletions

diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index 4a55490432..2fbb046a31 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -110,7 +110,7 @@ static REPLACEVARSARRAY sttVarsToReplace[] =
 

 static void patchDir(wchar_t *str, size_t strSize)

 {

-	wchar_t *result = Utils_ReplaceVarsT(str, 0, sttVarsToReplace);

+	wchar_t *result = Utils_ReplaceVarsW(str, 0, sttVarsToReplace);

 	if (result) {

 		wcsncpy(str, result, strSize);

 		mir_free(result);

@@ -146,7 +146,7 @@ void GetContactReceivedFilesDir(MCONTACT hContact, wchar_t *szDir, int cchDir, B
 		for (int i = 0; i < (_countof(rvaVarsToReplace) - 1); i++)

 			RemoveInvalidFilenameChars(rvaVarsToReplace[i].value.w);

 

-		wchar_t *result = Utils_ReplaceVarsT(tszTemp, hContact, rvaVarsToReplace);

+		wchar_t *result = Utils_ReplaceVarsW(tszTemp, hContact, rvaVarsToReplace);

 		if (result) {

 			wcsncpy(tszTemp, result, _countof(tszTemp));

 			mir_free(result);

diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index d810d1b340..61e9fbb0f5 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -2123,14 +2123,14 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 
 				case ID_SEARCH_GOOGLE:
 					if (pszWord[0])
-						Utils_OpenUrlT(CMStringW(FORMAT, L"http://www.google.com/search?q=%s", pszWord));
+						Utils_OpenUrlW(CMStringW(FORMAT, L"http://www.google.com/search?q=%s", pszWord));
 
 					PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);
 					break;
 
 				case ID_SEARCH_WIKIPEDIA:
 					if (pszWord[0])
-						Utils_OpenUrlT(CMStringW(FORMAT, L"http://en.wikipedia.org/wiki/%s", pszWord));
+						Utils_OpenUrlW(CMStringW(FORMAT, L"http://en.wikipedia.org/wiki/%s", pszWord));
 
 					PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);
 					break;
@@ -2172,11 +2172,11 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 							ClientToScreen(((NMHDR *)lParam)->hwndFrom, &pt);
 							switch (TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL)) {
 							case ID_NEW:
-								Utils_OpenUrlT(tr.lpstrText);
+								Utils_OpenUrlW(tr.lpstrText);
 								break;
 
 							case ID_CURR:
-								Utils_OpenUrlT(tr.lpstrText, false);
+								Utils_OpenUrlW(tr.lpstrText, false);
 								break;
 
 							case ID_COPY:
@@ -2198,7 +2198,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 							return TRUE;
 						}
 
-						Utils_OpenUrlT(tr.lpstrText);
+						Utils_OpenUrlW(tr.lpstrText);
 						SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE));
 						mir_free(tr.lpstrText);
 						break;
diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp
index b50f2ba7ce..2ff093934a 100644
--- a/src/mir_app/src/chat_tools.cpp
+++ b/src/mir_app/src/chat_tools.cpp
@@ -734,7 +734,7 @@ wchar_t* GetChatLogsFilename(SESSION_INFO *si, time_t tTime)
 		}

 		else ptszVarPath = g_Settings->pszLogDir;

 

-		wchar_t *tszParsedName = Utils_ReplaceVarsT(ptszVarPath, si->hContact, rva);

+		wchar_t *tszParsedName = Utils_ReplaceVarsW(ptszVarPath, si->hContact, rva);

 		if (chatApi.OnGetLogName)

 			chatApi.OnGetLogName(si, tszParsedName);

 		else

diff --git a/src/mir_app/src/enterstring.cpp b/src/mir_app/src/enterstring.cpp
index 5632a6acf1..b882ac0133 100644
--- a/src/mir_app/src/enterstring.cpp
+++ b/src/mir_app/src/enterstring.cpp
@@ -199,7 +199,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			tr.lpstrText = (wchar_t *)mir_alloc(sizeof(wchar_t)*(tr.chrg.cpMax - tr.chrg.cpMin + 2));

 			SendMessage(param->nmhdr.hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&tr);

 

-			Utils_OpenUrlT(tr.lpstrText);

+			Utils_OpenUrlW(tr.lpstrText);

 			mir_free(tr.lpstrText);

 		}

 		return TRUE;