- all static protocol services replaced with functions;

- m_protomod.h removed as useless

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

3 files changed, 3 insertions, 3 deletions

diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp
index 02e61c82d2..ed3196c1e5 100644
--- a/plugins/Weather/src/weather.cpp
+++ b/plugins/Weather/src/weather.cpp
@@ -218,7 +218,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	pd.cbSize = sizeof(pd);

 	pd.szName = WEATHERPROTONAME;

 	pd.type = (opt.NoProtoCondition) ? PROTOTYPE_VIRTUAL : PROTOTYPE_PROTOCOL;

-	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);

+	Proto_RegisterModule(&pd);

 

 	// initialize weather protocol services

 	InitServices();

diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h
index 182fb07cd9..6dfcb98e11 100644
--- a/plugins/Weather/src/weather.h
+++ b/plugins/Weather/src/weather.h
@@ -34,13 +34,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <malloc.h>

 

 #include <newpluginapi.h>

-#include <m_protomod.h>

 #include <m_icolib.h>

 #include <m_options.h>

 #include <m_langpack.h>

 #include <m_skin.h>

 #include <m_database.h>

 #include <m_history.h>

+#include <m_protosvc.h>

 #include <m_userinfo.h>

 #include <m_netlib.h>

 #include <m_ignore.h>

diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp
index ea5f444fdc..878b590c65 100644
--- a/plugins/Weather/src/weather_addstn.cpp
+++ b/plugins/Weather/src/weather_addstn.cpp
@@ -64,7 +64,7 @@ INT_PTR WeatherAddToList(WPARAM wParam, LPARAM lParam)
 	// if contact with the same ID was not found, add it

 	if (psr->cbSize < sizeof(PROTOSEARCHRESULT)) return 0;

 	MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

-	CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)WEATHERPROTONAME);

+	Proto_AddToContact(hContact, WEATHERPROTONAME);

 	// suppress online notification for the new contact

 	CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);