obsolete services from m_ignore.h converted into functions

6 files changed, 10 insertions, 10 deletions

diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index 5251abe84a..3c42865fe2 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -251,7 +251,7 @@ MCONTACT FacebookProto::AddToContactList(facebook_user* fbu, bool force_add, boo
 		setByte(hContact, FACEBOOK_KEY_CONTACT_TYPE, fbu->type);
 
 		if (getByte(FACEBOOK_KEY_DISABLE_STATUS_NOTIFY, 0))
-			CallService(MS_IGNORE_IGNORE, hContact, (LPARAM)IGNOREEVENT_USERONLINE);
+			Ignore_Ignore(hContact, IGNOREEVENT_USERONLINE);
 
 		if (!fbu->real_name.empty())
 			SaveName(hContact, fbu);
diff --git a/protocols/GmailNotifier/src/utility.cpp b/protocols/GmailNotifier/src/utility.cpp
index cda56e956c..7049763c55 100644
--- a/protocols/GmailNotifier/src/utility.cpp
+++ b/protocols/GmailNotifier/src/utility.cpp
@@ -10,7 +10,7 @@ void BuildList(void)
 			Account *p = new Account;
 			p->hContact = hContact;
 			mir_strcpy(p->name, szName);
-			CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
+			Ignore_Ignore(hContact, IGNOREEVENT_USERONLINE);
 
 			ptrA szPassword(g_plugin.getStringA(hContact, "Password"));
 			if (szPassword != nullptr)
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index d982705974..c21cdc0e65 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -685,7 +685,7 @@ bool CIrcProto::OnIrc_PRIVMSG(const CIrcMessage *pmsg)
 

 			CONTACT user = { pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, false, false, false };

 

-			if (CallService(MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_MESSAGE))

+			if (Ignore_IsIgnored(NULL, IGNOREEVENT_MESSAGE))

 			if (!CList_FindContact(&user))

 				return true;

 

@@ -1126,7 +1126,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage *pmsg)
 				}

 				else {

 					CONTACT user = { pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, false, false, false };

-					if (CallService(MS_IGNORE_ISIGNORED, NULL, IGNOREEVENT_FILE))

+					if (Ignore_IsIgnored(NULL, IGNOREEVENT_FILE))

 					if (!CList_FindContact(&user))

 						return true;

 

diff --git a/protocols/Non-IM Contact/src/contactinfo.cpp b/protocols/Non-IM Contact/src/contactinfo.cpp
index 797a328501..6f34ff479b 100644
--- a/protocols/Non-IM Contact/src/contactinfo.cpp
+++ b/protocols/Non-IM Contact/src/contactinfo.cpp
@@ -339,7 +339,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					free(replace);
 					MCONTACT hContact2 = db_add_contact();
 					Proto_AddToContact(hContact2, MODNAME);
-					CallService(MS_IGNORE_IGNORE, (WPARAM)hContact2, IGNOREEVENT_USERONLINE);
+					Ignore_Ignore(hContact2, IGNOREEVENT_USERONLINE);
 					g_plugin.setString(hContact2, "Nick", Translate("New Non-IM Contact"));
 					// blank dbVar2 so the replaceing doesnt crash..
 					mir_strcpy(dbVar2, "");
@@ -399,7 +399,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 						return 0;
 					}
 					Proto_AddToContact(hContact2, MODNAME);
-					CallService(MS_IGNORE_IGNORE, (WPARAM)hContact2, IGNOREEVENT_USERONLINE);
+					Ignore_Ignore(hContact2, IGNOREEVENT_USERONLINE);
 					g_plugin.setString(hContact2, "Nick", Translate("New Non-IM Contact"));
 					g_plugin.setString(hContact2, "Name", dbVar1);
 					if (!db_get_static(hContact1, MODNAME, "ProgramString", dbVar1, _countof(dbVar1)))
@@ -632,7 +632,7 @@ INT_PTR ImportContacts(WPARAM, LPARAM)
 					continue;
 				}
 				Proto_AddToContact(hContact, MODNAME);
-				CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
+				Ignore_Ignore(hContact, IGNOREEVENT_USERONLINE);
 				g_plugin.setString(hContact, "Nick", Translate("New Non-IM Contact"));
 				g_plugin.setString(hContact, "Name", name);
 				g_plugin.setString(hContact, "ProgramString", program);
diff --git a/protocols/Non-IM Contact/src/dialog.cpp b/protocols/Non-IM Contact/src/dialog.cpp
index 989f2fdb81..1db80c26df 100644
--- a/protocols/Non-IM Contact/src/dialog.cpp
+++ b/protocols/Non-IM Contact/src/dialog.cpp
@@ -305,7 +305,7 @@ INT_PTR addContact(WPARAM, LPARAM)
 	char tmp[256];
 	MCONTACT hContact = db_add_contact();
 	Proto_AddToContact(hContact, MODNAME);
-	CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
+	Ignore_Ignore(hContact, IGNOREEVENT_USERONLINE);
 	g_plugin.setWString(hContact, "Nick", TranslateT("New Non-IM Contact"));
 	DoPropertySheet(hContact);
 	if (db_get_static(hContact, MODNAME, "Name", tmp, _countof(tmp)))
@@ -321,7 +321,7 @@ INT_PTR editContact(WPARAM wParam, LPARAM)
 	if (!hContact) {
 		hContact = db_add_contact();
 		Proto_AddToContact(hContact, MODNAME);
-		CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
+		Ignore_Ignore(hContact, IGNOREEVENT_USERONLINE);
 		g_plugin.setString(hContact, "Nick", Translate("New Non-IM Contact"));
 	}
 	DoPropertySheet(hContact);
diff --git a/protocols/Weather/src/weather_addstn.cpp b/protocols/Weather/src/weather_addstn.cpp
index 5804f42b00..96ab251cf6 100644
--- a/protocols/Weather/src/weather_addstn.cpp
+++ b/protocols/Weather/src/weather_addstn.cpp
@@ -66,7 +66,7 @@ INT_PTR WeatherAddToList(WPARAM, LPARAM lParam)
 	MCONTACT hContact = db_add_contact();
 	Proto_AddToContact(hContact, MODULENAME);
 	// suppress online notification for the new contact
-	CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);
+	Ignore_Ignore(hContact, IGNOREEVENT_USERONLINE);
 
 	// set contact info and settings
 	wchar_t svc[256];