core changes:

- PROTOCOLDESCRIPTOR's implementation hidden inside mir_app;
- Proto_RegisterModule now doesn't need a PROTOCOLDESCRIPTOR structure;
- PROTOTYPE_PROTOWITHACCS type added for protos that work with accounts

6 files changed, 5 insertions, 9 deletions

diff --git a/plugins/CloudFile/src/Services/dropbox_service.cpp b/plugins/CloudFile/src/Services/dropbox_service.cpp
index a738bbe09b..528cb8e386 100644
--- a/plugins/CloudFile/src/Services/dropbox_service.cpp
+++ b/plugins/CloudFile/src/Services/dropbox_service.cpp
@@ -315,7 +315,7 @@ struct CMPluginDropbox : public PLUGIN<CMPluginDropbox>
 	{
 		m_hInst = g_plugin.getInst();
 
-		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)CDropboxService::Init, (pfnUninitProto)CDropboxService::UnInit);
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CDropboxService::Init, (pfnUninitProto)CDropboxService::UnInit);
 	}
 }
 	g_pluginDropbox;
diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp
index e3a7a95d15..05befd78f7 100644
--- a/plugins/CloudFile/src/Services/google_service.cpp
+++ b/plugins/CloudFile/src/Services/google_service.cpp
@@ -299,7 +299,7 @@ struct CMPluginGoogle : public CMPluginBase
 	{
 		m_hInst = g_plugin.getInst();
 
-		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)CGDriveService::Init, (pfnUninitProto)CGDriveService::UnInit);
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CGDriveService::Init, (pfnUninitProto)CGDriveService::UnInit);
 	}
 }
 	g_pluginGoogle;
diff --git a/plugins/CloudFile/src/Services/microsoft_service.cpp b/plugins/CloudFile/src/Services/microsoft_service.cpp
index c4ec053eaa..1de8e52ee9 100644
--- a/plugins/CloudFile/src/Services/microsoft_service.cpp
+++ b/plugins/CloudFile/src/Services/microsoft_service.cpp
@@ -284,7 +284,7 @@ struct CMPluginOnedrive : public CMPluginBase
 	{
 		m_hInst = g_plugin.getInst();
 
-		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)COneDriveService::Init, (pfnUninitProto)COneDriveService::UnInit);
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)COneDriveService::Init, (pfnUninitProto)COneDriveService::UnInit);
 	}
 }
 	g_pluginOnedrive;
diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp
index e05f216698..3e5e63440b 100644
--- a/plugins/CloudFile/src/Services/yandex_service.cpp
+++ b/plugins/CloudFile/src/Services/yandex_service.cpp
@@ -294,7 +294,7 @@ struct CMPluginYandex : public CMPluginBase
 	{
 		m_hInst = g_plugin.getInst();
 
-		RegisterProtocol(PROTOTYPE_PROTOCOL, (pfnInitProto)CYandexService::Init, (pfnUninitProto)CYandexService::UnInit);
+		RegisterProtocol(PROTOTYPE_PROTOWITHACCS, (pfnInitProto)CYandexService::Init, (pfnUninitProto)CYandexService::UnInit);
 	}
 }
 	g_pluginYandex;
diff --git a/plugins/CloudFile/src/services.cpp b/plugins/CloudFile/src/services.cpp
index 28cda47967..edaad32901 100644
--- a/plugins/CloudFile/src/services.cpp
+++ b/plugins/CloudFile/src/services.cpp
@@ -95,10 +95,7 @@ INT_PTR Upload(WPARAM wParam, LPARAM lParam)
 
 void InitializeServices()
 {
-	PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
-	pd.type = PROTOTYPE_FILTER;
-	pd.szName = MODULE;
-	Proto_RegisterModule(&pd);
+	Proto_RegisterModule(PROTOTYPE_FILTER, MODULE);
 
 	CreateServiceFunction(MODULE PSS_FILE, SendFileInterceptor);
 
diff --git a/plugins/CloudFile/src/stdafx.h b/plugins/CloudFile/src/stdafx.h
index d475b54c11..5cfc53b59a 100644
--- a/plugins/CloudFile/src/stdafx.h
+++ b/plugins/CloudFile/src/stdafx.h
@@ -30,7 +30,6 @@
 #include <m_metacontacts.h>
 #include <m_protoint.h>
 #include <m_protosvc.h>
-#include <m_plugin.h>
 
 #include <m_cloudfile.h>