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

20 files changed, 1 insertions, 24 deletions

diff --git a/protocols/Discord/src/stdafx.h b/protocols/Discord/src/stdafx.h
index 76a0d44862..91c99ee7f7 100644
--- a/protocols/Discord/src/stdafx.h
+++ b/protocols/Discord/src/stdafx.h
@@ -38,7 +38,6 @@
 #include <m_hotkeys.h>
 #include <m_json.h>
 #include <m_avatars.h>
-#include <m_plugin.h>
 #include <win2k.h>
 
 #include "../../libs/zlib/src/zlib.h"
diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h
index 1ebadd033c..26ecb0a4bf 100644
--- a/protocols/Dummy/src/stdafx.h
+++ b/protocols/Dummy/src/stdafx.h
@@ -54,7 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <m_userinfo.h>
 #include <m_utils.h>
 #include <m_proto_listeningto.h>
-#include <m_plugin.h>
 
 #include <m_folders.h>
 
diff --git a/protocols/EmLanProto/src/stdafx.h b/protocols/EmLanProto/src/stdafx.h
index f3156dd280..1fc82252ce 100644
--- a/protocols/EmLanProto/src/stdafx.h
+++ b/protocols/EmLanProto/src/stdafx.h
@@ -16,7 +16,6 @@
 #include <m_protosvc.h>

 #include <m_database.h>

 #include <m_langpack.h>

-#include <m_plugin.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h
index f41eb6c7f1..1016b54eb8 100644
--- a/protocols/FacebookRM/src/stdafx.h
+++ b/protocols/FacebookRM/src/stdafx.h
@@ -62,7 +62,6 @@ 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;

 

diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index f02dc0be26..be94b8cfb9 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -69,7 +69,6 @@
 #include <win2k.h>

 #include <m_folders.h>

 #include <m_gui.h>

-#include <m_plugin.h>

 

 // libgadu headers

 #include "libgadu.h"

diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp
index 38355f466b..523917cb3e 100644
--- a/protocols/ICQCorp/src/corp.cpp
+++ b/protocols/ICQCorp/src/corp.cpp
@@ -62,11 +62,7 @@ BOOL APIENTRY DllMain(HINSTANCE hModule, DWORD reason, LPVOID)
 		findData.cFileName[strlen(findData.cFileName) - 4] = 0;

 		strncpy_s(protoName, findData.cFileName, _TRUNCATE);

 

-		PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE };

-		pd.szName = protoName;

-		pd.type = PROTOTYPE_PROTOCOL;

-		Proto_RegisterModule(&pd);

-

+		Proto_RegisterModule(PROTOTYPE_PROTOCOL, protoName);

 		Proto_SetUniqueId(protoName, "UIN");

 

 		DisableThreadLibraryCalls(hModule);

diff --git a/protocols/ICQCorp/src/stdafx.h b/protocols/ICQCorp/src/stdafx.h
index 99837f6a28..747f1805bf 100644
--- a/protocols/ICQCorp/src/stdafx.h
+++ b/protocols/ICQCorp/src/stdafx.h
@@ -37,7 +37,6 @@
 #include <m_clist.h>
 #include <m_userinfo.h>
 #include <m_timezones.h>
-#include <m_plugin.h>
 #include <m_netlib.h>
 
 #include "user.h"
diff --git a/protocols/IRCG/src/stdafx.h b/protocols/IRCG/src/stdafx.h
index fff9477127..37343328b9 100644
--- a/protocols/IRCG/src/stdafx.h
+++ b/protocols/IRCG/src/stdafx.h
@@ -66,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_string.h"

 #include "win2k.h"

 #include "m_gui.h"

-#include <m_plugin.h>

 

 #include "resource.h"

 

diff --git a/protocols/IcqOscarJ/src/stdafx.h b/protocols/IcqOscarJ/src/stdafx.h
index 303c6f363e..9aefe64717 100644
--- a/protocols/IcqOscarJ/src/stdafx.h
+++ b/protocols/IcqOscarJ/src/stdafx.h
@@ -80,7 +80,6 @@
 #include <m_timezones.h>

 #include <win2k.h>

 #include <m_gui.h>

-#include <m_plugin.h>

 

 // Project resources

 #include "resource.h"

diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index 72833d8381..36b8b8c8bd 100755
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -87,7 +87,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>

 #include <m_imgsrvc.h>

 #include <m_clc.h>

-#include <m_plugin.h>

 

 #include <m_folders.h>

 #include <m_fingerprint.h>

diff --git a/protocols/MRA/src/stdafx.h b/protocols/MRA/src/stdafx.h
index bd34263f9b..6ee9201b4c 100644
--- a/protocols/MRA/src/stdafx.h
+++ b/protocols/MRA/src/stdafx.h
@@ -50,7 +50,6 @@
 #include <m_xstatus.h>

 #include <m_nudge.h>

 #include <m_proto_listeningto.h>

-#include <m_plugin.h>

 

 #define PROTO_VERSION_MAJOR     1

 #define PROTO_VERSION_MINOR     21

diff --git a/protocols/MSN/src/stdafx.h b/protocols/MSN/src/stdafx.h
index f996fcdecc..dc4567fc45 100644
--- a/protocols/MSN/src/stdafx.h
+++ b/protocols/MSN/src/stdafx.h
@@ -63,7 +63,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_nudge.h>

 #include <m_string.h>

 #include <m_json.h>

-#include <m_plugin.h>

 

 #include "m_proto_listeningto.h"

 #include "m_folders.h"

diff --git a/protocols/MinecraftDynmap/src/stdafx.h b/protocols/MinecraftDynmap/src/stdafx.h
index 7613c4181d..d47e51733c 100644
--- a/protocols/MinecraftDynmap/src/stdafx.h
+++ b/protocols/MinecraftDynmap/src/stdafx.h
@@ -57,7 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_message.h>
 #include <m_json.h>
 #include <m_http.h>
-#include <m_plugin.h>
 
 #include "version.h"
 
diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h
index b6aec36b82..cb38f78ec1 100644
--- a/protocols/Omegle/src/stdafx.h
+++ b/protocols/Omegle/src/stdafx.h
@@ -58,7 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_message.h>

 #include <m_http.h>

 #include <m_json.h>

-#include <m_plugin.h>

 

 #include "version.h"

 

diff --git a/protocols/Sametime/src/StdAfx.h b/protocols/Sametime/src/StdAfx.h
index 9f8fe88525..5fa7d2b4d3 100644
--- a/protocols/Sametime/src/StdAfx.h
+++ b/protocols/Sametime/src/StdAfx.h
@@ -75,4 +75,3 @@ extern "C" {
 #include <m_genmenu.h>

 #include <m_icolib.h>

 #include <m_string.h>

-#include <m_plugin.h>
\ No newline at end of file
diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h
index 0be6ba5730..a9e15f715c 100644
--- a/protocols/SkypeWeb/src/stdafx.h
+++ b/protocols/SkypeWeb/src/stdafx.h
@@ -54,7 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <m_xml.h>

 #include <m_assocmgr.h>

 #include <m_file.h>

-#include <m_plugin.h>

 

 struct CSkypeProto;

 

diff --git a/protocols/Steam/src/stdafx.h b/protocols/Steam/src/stdafx.h
index 4a70cb0159..1f48146cb7 100644
--- a/protocols/Steam/src/stdafx.h
+++ b/protocols/Steam/src/stdafx.h
@@ -35,7 +35,6 @@
 #include <m_gui.h>

 #include <m_http.h>

 #include <m_system.h>

-#include <m_plugin.h>

 

 #include "resource.h"

 #include "version.h"

diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h
index be29bd7edb..124fc96b0b 100644
--- a/protocols/Tox/src/stdafx.h
+++ b/protocols/Tox/src/stdafx.h
@@ -36,7 +36,6 @@
 #include <m_assocmgr.h>

 #include <m_json.h>

 #include <m_http.h>

-#include <m_plugin.h>

 

 #include <tox.h>

 #include <toxencryptsave.h>

diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h
index eaae38768d..3eb1d93a87 100644
--- a/protocols/Twitter/src/stdafx.h
+++ b/protocols/Twitter/src/stdafx.h
@@ -58,7 +58,6 @@ typedef std::basic_string<wchar_t> wstring;
 #include <m_icolib.h>

 #include <m_utils.h>

 #include <m_hotkeys.h>

-#include <m_plugin.h>

 #include <m_json.h>

 #include <win2k.h>

 #pragma warning(pop)

diff --git a/protocols/VKontakte/src/stdafx.h b/protocols/VKontakte/src/stdafx.h
index 5695d1bbf1..d039a13d52 100644
--- a/protocols/VKontakte/src/stdafx.h
+++ b/protocols/VKontakte/src/stdafx.h
@@ -48,7 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <m_userinfo.h>

 #include <m_proto_listeningto.h>

 #include <m_gui.h>

-#include <m_plugin.h>

 

 #include <m_messagestate.h>

 #include <m_popup.h>