- 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, 2 insertions, 3 deletions

diff --git a/plugins/GmailNotifier/src/gmail.h b/plugins/GmailNotifier/src/gmail.h
index 9337667f7c..1c56a13e80 100644
--- a/plugins/GmailNotifier/src/gmail.h
+++ b/plugins/GmailNotifier/src/gmail.h
@@ -11,7 +11,6 @@
 #include "m_clui.h"

 #include "m_skin.h"

 #include "m_langpack.h"

-#include "m_protomod.h"

 #include "m_database.h"

 #include "m_system.h"

 #include "m_protocols.h"

diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp
index 82ebf9e18a..784b4db6ab 100644
--- a/plugins/GmailNotifier/src/main.cpp
+++ b/plugins/GmailNotifier/src/main.cpp
@@ -95,7 +95,7 @@ extern "C" int __declspec(dllexport) Load()
 	PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE };

 	pd.szName = pluginName;

 	pd.type = PROTOTYPE_VIRTUAL;

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

+	Proto_RegisterModule(&pd);

 

 	CreateProtoServiceFunction(pluginName, PS_GETCAPS, GetCaps);

 	CreateProtoServiceFunction(pluginName, PS_GETSTATUS, GetStatus);

diff --git a/plugins/GmailNotifier/src/options.cpp b/plugins/GmailNotifier/src/options.cpp
index fff4b59f0e..19ce5830ac 100644
--- a/plugins/GmailNotifier/src/options.cpp
+++ b/plugins/GmailNotifier/src/options.cpp
@@ -150,7 +150,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			SetDlgItemTextA(hwndDlg, IDC_PASS, "");

 			SetFocus(hwndCombo);

 			acc[curIndex].hContact = CallService(MS_DB_CONTACT_ADD, 0, 0);

-			CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)acc[curIndex].hContact, (LPARAM)pluginName);

+			Proto_AddToContact(acc[curIndex].hContact, pluginName);

 			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;