MS_UTIL_OPENURL -> mir_core::Utils_OpenUrl

git-svn-id: http://svn.miranda-ng.org/main/trunk@14306 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 12 insertions, 12 deletions

diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp
index d58f6cfe91..c46d9b9c3e 100644
--- a/plugins/WebView/src/webview.cpp
+++ b/plugins/WebView/src/webview.cpp
@@ -183,8 +183,8 @@ int Doubleclick(WPARAM wParam, LPARAM lParam)
 

 	int action = db_get_b(hContact, MODULENAME, DBLE_WIN_KEY, 1);

 	if (action == 0) {

-		ptrT url( db_get_tsa(hContact, MODULENAME, "URL"));

-		CallService(MS_UTILS_OPENURL, OUF_TCHAR, (WPARAM)url);

+		ptrT url(db_get_tsa(hContact, MODULENAME, "URL"));

+		Utils_OpenUrlT(url);

 

 		db_set_w(hContact, MODULENAME, "Status", ID_STATUS_ONLINE);     

 	}

@@ -456,9 +456,9 @@ int OnTopMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact)
 INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM lParam)

 {

 	MCONTACT hContact = wParam;

-	ptrT url( db_get_tsa(hContact, MODULENAME, "URL"));

+	ptrT url(db_get_tsa(hContact, MODULENAME, "URL"));

 	if (url)

-		CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

+		Utils_OpenUrlT(url);

 

 	db_set_w(hContact, MODULENAME, "Status", ID_STATUS_ONLINE); 

 	return 0;

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index 5e1810cd89..4d5cee7b71 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -41,13 +41,13 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 					PUDeletePopup(hWnd);

 				}

 				// open url

-				if ( db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)) {

-					CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

+				if (db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)) {

+					Utils_OpenUrlT(url);

 					PUDeletePopup(hWnd);

 					db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 				}

 				// dismiss

-				if ( db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 1))

+				if (db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 1))

 					PUDeletePopup(hWnd);

 			}	

 			else if (hContact == NULL)

@@ -56,14 +56,14 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		else if (message == WM_CONTEXTMENU) { // right click

 			if (hContact != NULL) {   

 				// open datA window

-				if ( db_get_b(NULL, MODULENAME, RCLK_WINDOW_KEY, 0)) {

+				if (db_get_b(NULL, MODULENAME, RCLK_WINDOW_KEY, 0)) {

 					NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

 					mir_forkthread(GetData, (void*)hContact);

 					PUDeletePopup(hWnd);

 				}

 				// open url

-				if ( db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1)) {

-					CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

+				if (db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1)) {

+					Utils_OpenUrlT(url);

 					PUDeletePopup(hWnd);

 					db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 				}

diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp
index 4c0113f045..09bcbd867d 100644
--- a/plugins/WebView/src/webview_datawnd.cpp
+++ b/plugins/WebView/src/webview_datawnd.cpp
@@ -325,7 +325,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 					memcpy(tr.lpstrText, "mailto:", 7);

 				}

 

-				CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM) tr.lpstrText);

+				Utils_OpenUrl(tr.lpstrText);

 				SetFocus(GetDlgItem(hwndDlg, IDC_DATA));

 

 				free(tr.lpstrText);

@@ -338,7 +338,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		switch (LOWORD(wParam)) {

 		case IDC_OPEN_URL:

 			GetDlgItemText(hwndDlg, IDC_OPEN_URL, url, _countof(url));

-			CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);  

+			Utils_OpenUrlT(url);  

 			db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 			break;