all protocols rewritten to CMPluginBase

2 files changed, 13 insertions, 8 deletions

diff --git a/protocols/FacebookRM/src/main.cpp b/protocols/FacebookRM/src/main.cpp
index 849ceec906..28bc66d172 100644
--- a/protocols/FacebookRM/src/main.cpp
+++ b/protocols/FacebookRM/src/main.cpp
@@ -91,14 +91,6 @@ extern "C" int __declspec(dllexport) Load(void)
 	mir_getLP(&pluginInfo);

 	pcli = Clist_GetInterface();

 

-	PROTOCOLDESCRIPTOR pd = { 0 };

-	pd.cbSize = sizeof(pd);

-	pd.szName = FACEBOOK_NAME;

-	pd.type = PROTOTYPE_PROTOCOL;

-	pd.fnInit = protoInit;

-	pd.fnUninit = protoUninit;

-	Proto_RegisterModule(&pd);

-

 	InitIcons();

 	InitContactMenus();

 

@@ -128,3 +120,15 @@ extern "C" int __declspec(dllexport) Unload(void)
 {

 	return 0;

 }

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+struct CMPlugin : public CMPluginBase

+{

+	CMPlugin() :

+		CMPluginBase(FACEBOOK_NAME)

+	{

+		RegisterProtocol(PROTOTYPE_PROTOCOL, protoInit, protoUninit);

+	}

+}

+	g_plugin;

diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h
index ea411d908f..7e044a4bb7 100644
--- a/protocols/FacebookRM/src/stdafx.h
+++ b/protocols/FacebookRM/src/stdafx.h
@@ -62,6 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_http.h>

 #include <m_messagestate.h>

 #include <m_gui.h>

+#include <m_plugin.h>

 

 class FacebookProto;