PSS_URL removed as totally obsolete

5 files changed, 16 insertions, 31 deletions

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 673016746d..3aee20c8d4 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -64,7 +64,6 @@ Skin_GetIconName           @24
 ?SendContacts@PROTO_INTERFACE@@UAEHIHHPAI@Z @66 NONAME

 ?SendFile@PROTO_INTERFACE@@UAEPAXIPB_WPAPA_W@Z @67 NONAME

 ?SendMsg@PROTO_INTERFACE@@UAEHIHPBD@Z @68 NONAME

-?SendUrl@PROTO_INTERFACE@@UAEHIHPBD@Z @69 NONAME

 ?SetApparentMode@PROTO_INTERFACE@@UAEHIH@Z @70 NONAME

 ?SetAwayMsg@PROTO_INTERFACE@@UAEHHPB_W@Z @71 NONAME

 ?SetStatus@PROTO_INTERFACE@@UAEHH@Z @72 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 513a79e71c..208676636e 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -64,7 +64,6 @@ Skin_GetIconName           @24
 ?SendContacts@PROTO_INTERFACE@@UEAAHIHHPEAI@Z @66 NONAME

 ?SendFile@PROTO_INTERFACE@@UEAAPEAXIPEB_WPEAPEA_W@Z @67 NONAME

 ?SendMsg@PROTO_INTERFACE@@UEAAHIHPEBD@Z @68 NONAME

-?SendUrl@PROTO_INTERFACE@@UEAAHIHPEBD@Z @69 NONAME

 ?SetApparentMode@PROTO_INTERFACE@@UEAAHIH@Z @70 NONAME

 ?SetAwayMsg@PROTO_INTERFACE@@UEAAHHPEB_W@Z @71 NONAME

 ?SetStatus@PROTO_INTERFACE@@UEAAHH@Z @72 NONAME

diff --git a/src/mir_app/src/proto_internal.cpp b/src/mir_app/src/proto_internal.cpp
index 88f8418cea..919d779c56 100644
--- a/src/mir_app/src/proto_internal.cpp
+++ b/src/mir_app/src/proto_internal.cpp
@@ -239,12 +239,6 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		return (int)ProtoCallService(m_szModuleName, PSS_MESSAGE, 0, (LPARAM)&ccs);

 	}

 

-	int SendUrl(MCONTACT hContact, int flags, const char* url) override

-	{

-		CCSDATA ccs = { hContact, PSS_URL, (WPARAM)flags, (LPARAM)url };

-		return (int)ProtoCallService(m_szModuleName, PSS_URL, 0, (LPARAM)&ccs);

-	}

-

 	int SetApparentMode(MCONTACT hContact, int mode) override

 	{

 		CCSDATA ccs = { hContact, PSS_SETAPPARENTMODE, (WPARAM)mode, 0 };

diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp
index d97d8f5396..6b3a6aa40a 100644
--- a/src/mir_app/src/proto_utils.cpp
+++ b/src/mir_app/src/proto_utils.cpp
@@ -555,11 +555,6 @@ int PROTO_INTERFACE::SendMsg(MCONTACT, int, const char*)
 	return 0; // error

 }

 

-int PROTO_INTERFACE::SendUrl(MCONTACT, int, const char*)

-{

-	return 1; // error

-}

-

 int PROTO_INTERFACE::SetApparentMode(MCONTACT, int)

 {

 	return 1; // error

diff --git a/src/mir_app/src/protocols.cpp b/src/mir_app/src/protocols.cpp
index 2e1261116b..e2eb88bbc4 100644
--- a/src/mir_app/src/protocols.cpp
+++ b/src/mir_app/src/protocols.cpp
@@ -68,15 +68,14 @@ static TServiceListItem serviceItems[] =
 	{ PSS_CONTACTS,         24 },

 	{ PSS_FILE,             25 },

 	{ PSS_MESSAGE,          26 },

-	{ PSS_URL,              27 },

-	{ PSS_SETAPPARENTMODE,  28 },

-	{ PS_SETSTATUS,         29 },

-	{ PSS_GETAWAYMSG,       30 },

-	{ PSR_AWAYMSG,          31 },

-	{ PS_SETAWAYMSG,        33 },

-	{ PSS_USERISTYPING,     34 },

-	{ PS_GETNAME,           35 },

-	{ PS_GETSTATUS,         36 }

+	{ PSS_SETAPPARENTMODE,  27 },

+	{ PS_SETSTATUS,         28 },

+	{ PSS_GETAWAYMSG,       29 },

+	{ PSR_AWAYMSG,          30 },

+	{ PS_SETAWAYMSG,        31 },

+	{ PSS_USERISTYPING,     32 },

+	{ PS_GETNAME,           33 },

+	{ PS_GETSTATUS,         34 }

 };

 

 //------------------------------------------------------------------------------------

@@ -430,15 +429,14 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 				case 24: return (INT_PTR)ppi->SendContacts(hContact, LOWORD(wParam), HIWORD(wParam), (MCONTACT*)lParam);

 				case 25: return (INT_PTR)ppi->SendFile(hContact, (wchar_t*)wParam, (wchar_t**)lParam);

 				case 26: return (INT_PTR)ppi->SendMsg(hContact, wParam, (const char*)lParam);

-				case 27: return (INT_PTR)ppi->SendUrl(hContact, wParam, (const char*)lParam);

-				case 28: return (INT_PTR)ppi->SetApparentMode(hContact, wParam);

-				case 29: return (INT_PTR)ppi->SetStatus(wParam);

-				case 30: return (INT_PTR)ppi->GetAwayMsg(hContact);

-				case 31: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam);

-				case 33: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t*)lParam);

-				case 34: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);

-				case 35: mir_strncpy((char*)lParam, ppi->m_szModuleName, wParam); return 0;

-				case 36:

+				case 27: return (INT_PTR)ppi->SetApparentMode(hContact, wParam);

+				case 28: return (INT_PTR)ppi->SetStatus(wParam);

+				case 29: return (INT_PTR)ppi->GetAwayMsg(hContact);

+				case 30: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam);

+				case 31: return (INT_PTR)ppi->SetAwayMsg(wParam, (wchar_t*)lParam);

+				case 32: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);

+				case 33: mir_strncpy((char*)lParam, ppi->m_szModuleName, wParam); return 0;

+				case 34:

 					return ppi->m_iStatus;

 				}

 			}