no more PLUGININFOEX::replacesDefaultModule, that old & nasty clutch

since now all Myranda plugins are binary incompatible with Miranda's

git-svn-id: http://svn.miranda-ng.org/main/trunk@743 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 1 insertions, 47 deletions

diff --git a/include/m_plugins.h b/include/m_plugins.h
index 95657cd1bb..a416295c2e 100644
--- a/include/m_plugins.h
+++ b/include/m_plugins.h
@@ -39,47 +39,6 @@ typedef struct PLUGIN_DB_ENUM {
 } PLUGIN_DB_ENUM;

 #define MS_PLUGINS_ENUMDBPLUGINS "Plugins/DbEnumerate"

 

-

-//#define DEFMOD_PROTOCOLICQ  1     //removed from v0.3 alpha

-//#define DEFMOD_PROTOCOLMSN  2	    //removed from v0.1.2.0+

-#define DEFMOD_UIFINDADD      3

-#define DEFMOD_UIUSERINFO     4

-#define DEFMOD_SRMESSAGE      5

-#define DEFMOD_SRURL          6

-#define DEFMOD_SREMAIL        7

-#define DEFMOD_SRAUTH         8

-#define DEFMOD_SRFILE         9

-#define DEFMOD_UIHELP         10

-#define DEFMOD_UIHISTORY      11

-//#define DEFMOD_RNDCHECKUPD  12    //removed from v0.3.1 alpha

-//#define DEFMOD_RNDICQIMPORT 13	//removed from v0.3 alpha

-#define DEFMOD_RNDAUTOAWAY    14

-#define DEFMOD_RNDUSERONLINE  15

-//#define DEFMOD_RNDCRYPT     16    // v0.1.0.1-v0.1.2.0

-#define DEFMOD_SRAWAY         17	// v0.1.0.1+

-#define DEFMOD_RNDIGNORE      18	// v0.1.0.1+

-#define DEFMOD_UIVISIBILITY   19    // v0.1.1.0+, options page only

-#define DEFMOD_UICLUI         20    // v0.1.1.0+

-//#define DEFMOD_UIPLUGINOPTS 21	// removed from 0.4.0.1

-//#define DEFMOD_PROTOCOLNETLIB 22	// removed from 0.8.0.5

-#define DEFMOD_RNDIDLE        23    // v0.3.4a+

-#define DEFMOD_CLISTALL       24	// v0.3.4a+ (2004/09/28)

-#define DEFMOD_DB             25    // v0.3.4.3+ (2004/10/11)

-//#define DEFMOD_FONTSERVICE  26    // v0.7.0+ (2006/11/17)

-#define DEFMOD_UPDATENOTIFY   27

-#define DEFMOD_SSL            28    // v0.8.0+

-#define DEFMOD_HIGHEST        28

-

-//plugins/getdisabledefaultarray

-//gets an array of the modules that the plugins report they want to replace

-//wParam=lParam=0

-//returns a pointer to an array of INT_PTR, with elements 1 or 0 indexed by the

-//DEFMOD_ constants. 1 to signify that the default module shouldn't be loaded.

-//this is primarily for use by the core's module initialiser, but could also

-//be used by modules that are doing naughty things that are very

-//feature-dependent

-#define MS_PLUGINS_GETDISABLEDEFAULTARRAY	   "Plugins/GetDisableDefaultArray"

-

 #endif // M_PLUGINS_H__

 

 

diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index e27855e34b..1f66cdc090 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -50,7 +50,6 @@ typedef struct _MUUID {
 

 /* Replaceable internal modules interface ids */

 #define MIID_HISTORY        {0x5ca0cbc1, 0x999a, 0x4ea2, {0x8b, 0x44, 0xf8, 0xf6, 0x7d, 0x7f, 0x8e, 0xbe}}

-#define MIID_UIFINDADD      {0xb22c528d, 0x6852, 0x48eb, {0xa2, 0x94, 0x0e, 0x26, 0xa9, 0x16, 0x12, 0x13}}

 #define MIID_UIUSERINFO     {0x570b931c, 0x9af8, 0x48f1, {0xad, 0x9f, 0xc4, 0x49, 0x8c, 0x61, 0x8a, 0x77}}

 #define MIID_SRURL          {0x5192445c, 0xf5e8, 0x46c0, {0x8f, 0x9e, 0x2b, 0x6d, 0x43, 0xe5, 0xc7, 0x53}}

 #define MIID_SRAUTH         {0x377780b9, 0x2b3b, 0x405b, {0x9f, 0x36, 0xb3, 0xc4, 0x87, 0x8e, 0x6f, 0x33}}

@@ -112,11 +111,7 @@ typedef struct PLUGININFOEX_tag
 	char *copyright;

 	char *homepage;

 	BYTE flags;	   // right now the only flag, UNICODE_AWARE, is recognized here

-	int replacesDefaultModule;		   //one of the DEFMOD_ constants in m_plugins.h or zero

-	         //if non-zero, this will supress the loading of the specified built-in module

-			 //with the implication that this plugin provides back-end-compatible features

-             /***********  WILL BE DEPRECATED in 0.8 * *************/

-    MUUID uuid; // Not required until 0.8.

+	MUUID uuid;    // plugin's unique identifier

 }

 	PLUGININFOEX;