4 files changed, 5 insertions, 13 deletions
diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp
index 085c488add..2049e99ec8 100644
--- a/protocols/Yahoo/src/options.cpp
+++ b/protocols/Yahoo/src/options.cpp
@@ -65,10 +65,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 
 		switch (LOWORD(wParam)) {
 		case IDC_NEWYAHOOACCOUNTLINK:
-			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW,
-				ppro->getByte("YahooJapan", 0) ?
-				(LPARAM)"http://edit.yahoo.co.jp/config/eval_register" :
-				(LPARAM)"http://edit.yahoo.com/config/eval_register");
+			Utils_OpenUrl(ppro->getByte("YahooJapan", 0) ? "http://edit.yahoo.co.jp/config/eval_register" : "http://edit.yahoo.com/config/eval_register");
 			return TRUE;
 
 			//case IDC_DISABLE_UTF8: 
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 0689e010b3..2bafb22610 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -683,12 +683,8 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 	case WM_COMMAND:
 		if (LOWORD(wParam) == IDC_NEWYAHOOACCOUNTLINK) {
-			CallService(MS_UTILS_OPENURL,
-				OUF_NEWWINDOW,
-				((BYTE)IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN) == 1) ?
-				(LPARAM) "http://edit.yahoo.co.jp/config/eval_register" :
-				(LPARAM) "http://edit.yahoo.com/config/eval_register"
-				);
+			Utils_OpenUrl(IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN) == 1 ? 
+				"http://edit.yahoo.co.jp/config/eval_register" : "http://edit.yahoo.com/config/eval_register");
 			return TRUE;
 		}
 
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 0155d8a3c6..9d79dd8d07 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -237,8 +237,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin)
 	}
 
 	debugLogA("[YahooOpenURL] url: %s Final URL: %s", url, tUrl);
-
-	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)tUrl);
+	Utils_OpenUrl(tUrl);
 }
 
 //=======================================================
diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp
index 7a04f48e61..486fe2a7b1 100644
--- a/protocols/Yahoo/src/util.cpp
+++ b/protocols/Yahoo/src/util.cpp
@@ -79,7 +79,7 @@ static LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT message, WPARAM wParam,
 		if (HIWORD(wParam) == STN_CLICKED) {
 			char *szURL = (char*)PUGetPluginData(hWnd);
 			if (szURL != NULL)
-				CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szURL);
+				Utils_OpenUrl(szURL);
 
 			PUDeletePopup(hWnd);
 			return 0;