Utils_OpenUrlT

Utils_ReplaceVarsT

8 files changed, 10 insertions, 10 deletions

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index ccfb0fbdbd..588087c3cb 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -972,7 +972,7 @@ void FacebookProto::OpenUrl(std::string url)
 		ForkThread(&FacebookProto::OpenUrlThread, new open_url(browser, data));
 	else
 		// Or use Miranda's service
-		Utils_OpenUrlT(data);
+		Utils_OpenUrlW(data);
 }
 
 void FacebookProto::ReadNotificationWorker(void *p)
diff --git a/protocols/GTalkExt/src/inbox.cpp b/protocols/GTalkExt/src/inbox.cpp
index f5433032a0..fb317bd2f8 100644
--- a/protocols/GTalkExt/src/inbox.cpp
+++ b/protocols/GTalkExt/src/inbox.cpp
@@ -191,7 +191,7 @@ void OpenUrl(LPCSTR acc, LPCTSTR mailbox, LPCTSTR url)
 {

 	extern DWORD itlsSettings;

 	if (!ReadCheckbox(0, IDC_AUTHONMAILBOX, (UINT_PTR)TlsGetValue(itlsSettings)) || !OpenUrlWithAuth(acc, mailbox, url))

-		Utils_OpenUrlT(url);

+		Utils_OpenUrlW(url);

 }

 

 void OpenContactInbox(LPCSTR szModuleName)

diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp
index 719d78591d..1c5b90f3df 100644
--- a/protocols/Gadu-Gadu/src/image.cpp
+++ b/protocols/Gadu-Gadu/src/image.cpp
@@ -801,7 +801,7 @@ int GGPROTO::img_displayasmsg(MCONTACT hContact, void *img)
 	int i, res;

 

 	if (hImagesFolder == NULL || FoldersGetCustomPathT(hImagesFolder, path, MAX_PATH, L"")) {

-		wchar_t *tmpPath = Utils_ReplaceVarsT( L"%miranda_userdata%");

+		wchar_t *tmpPath = Utils_ReplaceVarsW( L"%miranda_userdata%");

 		tPathLen = mir_snwprintf(szPath, L"%s\\%s\\ImageCache", tmpPath, m_tszUserName);

 		mir_free(tmpPath);

 	}

diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp
index cdf748a66d..724c2c9cef 100644
--- a/protocols/Gadu-Gadu/src/sessions.cpp
+++ b/protocols/Gadu-Gadu/src/sessions.cpp
@@ -347,7 +347,7 @@ static INT_PTR CALLBACK gg_sessions_viewdlg(HWND hwndDlg, UINT message, WPARAM w
 						szIP[0] = 0;

 						ListView_GetItemText(hList, lvhti.iItem, 1, szIP, _countof(szIP));

 						mir_snwprintf(szUrl, L"http://whois.domaintools.com/%s", szIP);

-						Utils_OpenUrlT(szUrl);

+						Utils_OpenUrlW(szUrl);

 						break;

 					}

 				}

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index b0faf81af6..de31e447f3 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -213,7 +213,7 @@ int CIrcProto::OnModulesLoaded(WPARAM, LPARAM)
 

 	wchar_t szTemp[MAX_PATH];

 	mir_snwprintf(szTemp, L"%%miranda_path%%\\Plugins\\%S_perform.ini", m_szModuleName);

-	wchar_t *szLoadFileName = Utils_ReplaceVarsT(szTemp);

+	wchar_t *szLoadFileName = Utils_ReplaceVarsW(szTemp);

 	char* pszPerformData = IrcLoadFile(szLoadFileName);

 	if (pszPerformData != NULL) {

 		char *p1 = pszPerformData, *p2 = pszPerformData;

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 4037a5e288..d0df6b7b72 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -1314,7 +1314,7 @@ void CIrcProto::InitIgnore(void)
 {

 	wchar_t szTemp[MAX_PATH];

 	mir_snwprintf(szTemp, L"%%miranda_path%%\\Plugins\\%S_ignore.ini", m_szModuleName);

-	wchar_t *szLoadFileName = Utils_ReplaceVarsT(szTemp);

+	wchar_t *szLoadFileName = Utils_ReplaceVarsW(szTemp);

 	char* pszIgnoreData = IrcLoadFile(szLoadFileName);

 	if (pszIgnoreData != NULL) {

 		char *p1 = pszIgnoreData;

@@ -1844,14 +1844,14 @@ static void sttImportIni(const wchar_t* szIniFile)
 

 void InitServers()

 {

-	wchar_t *szTemp = Utils_ReplaceVarsT(L"%miranda_path%\\Plugins\\IRC_servers.ini");

+	wchar_t *szTemp = Utils_ReplaceVarsW(L"%miranda_path%\\Plugins\\IRC_servers.ini");

 	sttImportIni(szTemp);

 	mir_free(szTemp);

 

 	RereadServers();

 

 	if (g_servers.getCount() == 0) {

-		wchar_t *szIniFile = Utils_ReplaceVarsT(L"%temp%\\default_servers.ini");

+		wchar_t *szIniFile = Utils_ReplaceVarsW(L"%temp%\\default_servers.ini");

 		FILE *serverFile = _wfopen(szIniFile, L"a");

 		if (serverFile) {

 			char* pszSvrs = (char*)LockResource(LoadResource(hInst, FindResource(hInst, MAKEINTRESOURCE(IDR_SERVERS), L"TEXT")));

diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index b1cc884948..de810c6911 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -347,7 +347,7 @@ void CJabberDlgBookmarks::OpenBookmark()
 				m_proto->GroupchatJoinRoom(server, room, ptrW(JabberNickFromJID(m_proto->m_szJabberJID)), item->password);

 		}

 	}

-	else Utils_OpenUrlT(item->jid);

+	else Utils_OpenUrlW(item->jid);

 }

 

 INT_PTR CJabberDlgBookmarks::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index e610b9c87a..0d3ae4142d 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -318,7 +318,7 @@ void CMsnProto::MSN_GetCustomSmileyFileName(MCONTACT hContact, wchar_t* pszDest,
 

 	wchar_t* path = (wchar_t*)alloca(cbLen * sizeof(wchar_t));

 	if (hCustomSmileyFolder == NULL || FoldersGetCustomPathT(hCustomSmileyFolder, path, (int)cbLen, L"")) {

-		wchar_t *tmpPath = Utils_ReplaceVarsT(L"%miranda_userdata%");

+		wchar_t *tmpPath = Utils_ReplaceVarsW(L"%miranda_userdata%");

 		wchar_t *tszModuleName = mir_a2u(m_szModuleName);

 		tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%s\\CustomSmiley", tmpPath, tszModuleName);

 		mir_free(tszModuleName);