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
---
 plugins/Weather/src/weather_contacts.cpp | 11 +++++------
 plugins/Weather/src/weather_ini.cpp      |  5 ++---
 plugins/Weather/src/weather_userinfo.cpp |  6 +++---
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'plugins/Weather')

diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp
index 4aed6418df..0bffa5a857 100644
--- a/plugins/Weather/src/weather_contacts.cpp
+++ b/plugins/Weather/src/weather_contacts.cpp
@@ -25,20 +25,18 @@ the contact.
 
 #include "weather.h"
 
-static void OpenUrl( TCHAR* format, TCHAR* id )
+static void OpenUrl(TCHAR* format, TCHAR* id)
 {
 	TCHAR loc[512];
-
-	GetID( id );
+	GetID(id);
 	mir_sntprintf(loc, _countof(loc), format, id);
-	
-	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)loc );
+	Utils_OpenUrlT(loc);
 }
 
 //============ BASIC CONTACTS FUNCTIONS AND LINKS  ============
-
 // view weather log for the contact
 // wParam = current contact
+
 INT_PTR ViewLog(WPARAM wParam, LPARAM lParam) 
 {
 	// see if the log path is set
@@ -56,6 +54,7 @@ INT_PTR ViewLog(WPARAM wParam, LPARAM lParam)
 
 // read complete forecast
 // wParam = current contact
+
 INT_PTR LoadForecast(WPARAM wParam, LPARAM lParam) 
 {
 	TCHAR id[256], loc2[256];
diff --git a/plugins/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp
index c89472cb2c..f39cb973ac 100644
--- a/plugins/Weather/src/weather_ini.cpp
+++ b/plugins/Weather/src/weather_ini.cpp
@@ -553,11 +553,10 @@ INT_PTR CALLBACK DlgProcSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		break;
 
 	case WM_COMMAND:
-		switch(LOWORD(wParam)) 
-		{
+		switch(LOWORD(wParam)) {
 		case IDC_STEP1:
 			// update current data
-			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)_T("http://miranda-ng.org/"));
+			Utils_OpenUrl("http://miranda-ng.org/");
 			break;
 
 		case IDC_STEP2: 
diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp
index aac6aa426e..0eb97fdb30 100644
--- a/plugins/Weather/src/weather_userinfo.cpp
+++ b/plugins/Weather/src/weather_userinfo.cpp
@@ -288,14 +288,14 @@ INT_PTR CALLBACK DlgProcMoreData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		{
 			LPNMHDR pNmhdr = (LPNMHDR)lParam;
 			if (pNmhdr->idFrom == IDC_MTEXT && pNmhdr->code == EN_LINK) {
-				ENLINK *enlink = (ENLINK *) lParam;
+				ENLINK *enlink = (ENLINK *)lParam;
 				switch (enlink->msg) {
 				case WM_LBUTTONUP:
 					TEXTRANGE tr;
 					tr.chrg = enlink->chrg;
-					tr.lpstrText = ( LPTSTR )mir_alloc( sizeof(TCHAR)*(tr.chrg.cpMax - tr.chrg.cpMin + 8));
+					tr.lpstrText = (LPTSTR)mir_alloc(sizeof(TCHAR)*(tr.chrg.cpMax - tr.chrg.cpMin + 8));
 					SendMessage(pNmhdr->hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
-					CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM) tr.lpstrText);
+					Utils_OpenUrlT(tr.lpstrText);
 					mir_free(tr.lpstrText);
 					break;
 				}
-- 
cgit v1.2.3