From ba456be50d3b780e4accf075ba78d5badf282b05 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 21 Jun 2015 19:09:56 +0000
Subject: MS_UTIL_OPENURL -> mir_core::Utils_OpenUrl

git-svn-id: http://svn.miranda-ng.org/main/trunk@14306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/src/MraConstans.h   | 6 +++---
 protocols/MRA/src/MraMPop.cpp     | 6 +++---
 protocols/MRA/src/Mra_menus.cpp   | 2 +-
 protocols/MRA/src/Mra_options.cpp | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'protocols/MRA')

diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h
index c17fc4152a..a5eb5aa6ff 100644
--- a/protocols/MRA/src/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
@@ -69,7 +69,7 @@ static const LPSTR lpcszMailRuDomains[] =
 #define MRA_WIN_INBOX_URL                    "https://win.mail.ru/cgi-bin/start"
 #define MRA_PDA_INBOX_URL                    "http://pda.mail.ru/cgi-bin/start"
 #define MRA_EDIT_PROFILE_URL                 "https://win.mail.ru/cgi-bin/userinfo?mra=1"
-#define MRA_SEARCH_URL                       _T("http://go.mail.ru")
+#define MRA_SEARCH_URL                       "http://go.mail.ru"
 
 // used spesialy! added: /domain/user
 #define MRA_BLOGS_URL                        "http://blogs.mail.ru"
@@ -79,8 +79,8 @@ static const LPSTR lpcszMailRuDomains[] =
 #define MRA_WORLD_URL                        "http://my.mail.ru"
 
 // without auth
-#define MRA_REGISTER_URL                     _T("https://win.mail.ru/cgi-bin/signup")
-#define MRA_FORGOT_PASSWORD_URL              _T("https://win.mail.ru/cgi-bin/passremind")
+#define MRA_REGISTER_URL                     "https://win.mail.ru/cgi-bin/signup"
+#define MRA_FORGOT_PASSWORD_URL              "https://win.mail.ru/cgi-bin/passremind"
 
 
 // wParam = hContact
diff --git a/protocols/MRA/src/MraMPop.cpp b/protocols/MRA/src/MraMPop.cpp
index a1d4b1830b..de0a8b9d35 100644
--- a/protocols/MRA/src/MraMPop.cpp
+++ b/protocols/MRA/src/MraMPop.cpp
@@ -68,7 +68,7 @@ DWORD CMraProto::MraMPopSessionQueueAddUrl(HANDLE hMPopSessionQueue, const CMStr
 	MRA_MPOP_SESSION_QUEUE_ITEM *pmpsqi;
 
 	if (!getByte("AutoAuthOnWebServices", MRA_DEFAULT_AUTO_AUTH_ON_WEB_SVCS) || !m_bLoggedIn) { /* Open without web auth. / Not loggedIn. */
-		CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)lpszUrl.c_str());
+		Utils_OpenUrl(lpszUrl);
 		return NO_ERROR;
 	}
 	/* Add to queue. */
@@ -128,7 +128,7 @@ void CMraProto::MraMPopSessionQueueStart(HANDLE hMPopSessionQueue)
 				pmpsqMPopSessionQueue->bKeyValid = false;
 				szEmail.MakeLower();
 				szUrl.Format(MRA_MPOP_AUTH_URL, szEmail, pmpsqMPopSessionQueue->lpszMPOPKey, pmpsqi->lpszUrl);
-				CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szUrl.c_str());
+				Utils_OpenUrl(szUrl);
 				debugLogA("Opening URL: %s\n", szUrl);
 			}
 			mir_free(pmpsqi);
@@ -145,7 +145,7 @@ void CMraProto::MraMPopSessionQueueFlush(HANDLE hMPopSessionQueue)
 	MRA_MPOP_SESSION_QUEUE_ITEM *pmpsqi;
 
 	while (FifoMTItemPop(pmpsqMPopSessionQueue, NULL, (LPVOID*)&pmpsqi) == NO_ERROR) {
-		CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)pmpsqi->lpszUrl);
+		Utils_OpenUrl(pmpsqi->lpszUrl);
 		mir_free(pmpsqi);
 	}
 }
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index ec0ee058dd..5d2082a1fd 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -21,7 +21,7 @@ INT_PTR CMraProto::MraEditProfile(WPARAM, LPARAM)
 
 INT_PTR CMraProto::MraWebSearch(WPARAM, LPARAM)
 {
-	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)MRA_SEARCH_URL);
+	Utils_OpenUrl(MRA_SEARCH_URL);
 	return 0;
 }
 
diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp
index b833a7cd22..6edfcfb59e 100644
--- a/protocols/MRA/src/Mra_options.cpp
+++ b/protocols/MRA/src/Mra_options.cpp
@@ -20,11 +20,11 @@ INT_PTR CALLBACK DlgProcOptsAccount(HWND hWndDlg, UINT msg, WPARAM wParam, LPARA
 	case WM_COMMAND:
 		switch (LOWORD(wParam)) {
 		case IDC_NEW_ACCOUNT_LINK:
-			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)MRA_REGISTER_URL);
+			Utils_OpenUrl(MRA_REGISTER_URL);
 			return TRUE;
 
 		case IDC_LOOKUPLINK:
-			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)MRA_FORGOT_PASSWORD_URL);
+			Utils_OpenUrl(MRA_FORGOT_PASSWORD_URL);
 			return TRUE;
 		}
 		if ((LOWORD(wParam) == IDC_LOGIN || LOWORD(wParam) == IDC_PASSWORD) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))
@@ -71,7 +71,7 @@ INT_PTR CALLBACK DlgProcAccount(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lP
 	case WM_COMMAND:
 		switch (LOWORD(wParam)) {
 		case IDC_NEW_ACCOUNT_LINK:
-			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)MRA_REGISTER_URL);
+			Utils_OpenUrl(MRA_REGISTER_URL);
 			return TRUE;
 		}
 		if (HIWORD(wParam) == EN_CHANGE && (HWND)lParam == GetFocus()) {
-- 
cgit v1.2.3