four forgotten meta services removed

2 files changed, 54 insertions, 106 deletions

diff --git a/include/delphi/m_metacontacts.inc b/include/delphi/m_metacontacts.inc
index 0c780125fc..b3864e32ef 100644
--- a/include/delphi/m_metacontacts.inc
+++ b/include/delphi/m_metacontacts.inc
@@ -26,12 +26,6 @@ const
   META_PROTO = 'MetaContacts';

 

 const

-  { gets the handle for the 'most online' contact

-    wParam=(HANDLE)hMetaContact

-    lParam=0

-    returns a handle to the 'most online' contact }

-  MS_MC_GETMOSTONLINECONTACT:PAnsiChar = 'MetaContacts/GetMostOnline';

-

   { fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set)

     wParam=(HANDLE)hMetaContact

     lParam=(HANDLE)hDefaultContact }

@@ -50,79 +44,52 @@ const
   }

   ME_MC_ENABLED:PAnsiChar = 'MetaContacts/OnEnabled';

 

-  { wParam=(HANDLE)hContact

-    lParam=0

-    convert a given contact into a metacontact

-  }

-  MS_MC_CONVERTTOMETA:PAnsiChar = 'MetaContacts/ConvertToMetacontact';

-

-  { wParam=(HANDLE)hContact

-    lParam=(HANDLE)hMeta

-    add an existing contact to a metacontact

-  }

-  MS_MC_ADDTOMETA:PAnsiChar = 'MetaContacts/AddToMetacontact';

-

-  { wParam=0

-    lParam=(HANDLE)hContact

-    remove a contact from a metacontact

-  }

-  MS_MC_REMOVEFROMMETA:PAnsiChar = 'MetaContacts/RemoveFromMetacontact';

-

-  {

-    wParam=(HANDLE)hContact

-    lParam=(HANDLE)hMeta

-    add an existing contact to a metacontact

-  }

-  MS_MC_GETSRMMSUB:PAnsiChar = 'MetaContacts/GetSrmmSub';

-

 /////////////////////////////////////////////////////////////////////////////////////////

 // binary interface to MC

 

 { returns true if metacontacts are enabled or false otherwise }

-function db_mc_isEnabled():bool; stdcall;

-                 external CoreDLL name 'db_mc_isEnabled';

+function db_mc_isEnabled():bool; stdcall; external AppDLL;

 

 { returns true if a contact is a metacontact or false otherwise }

-procedure db_mc_enable(bEnabled:bool); stdcall;

-                 external CoreDLL name 'db_mc_enable';

+procedure db_mc_enable(bEnabled:bool); stdcall; external AppDLL;

 

 { returns true if a contact is a metacontact or false otherwise }

-function db_mc_isMeta(hContact:TMCONTACT):bool; stdcall;

-                 external CoreDLL name 'db_mc_isMeta';

+function db_mc_isMeta(hContact:TMCONTACT):bool; stdcall; external AppDLL;

 

 { returns true if a contact is a subcontact or false otherwise }

-function db_mc_isSub(hContact:TMCONTACT):bool; stdcall;

-                 external CoreDLL name 'db_mc_isSub';

+function db_mc_isSub(hContact:TMCONTACT):bool; stdcall; external AppDLL;

 

 { gets the handle for the default contact or 0 on error }

-function db_mc_getDefault(hContact:TMCONTACT):TMCONTACT; stdcall;

-                 external CoreDLL name 'db_mc_getDefault';

+function db_mc_getDefault(hContact:TMCONTACT):TMCONTACT; stdcall; external AppDLL;

 

 { gets the contact number for the default contact or -1 on error }

-function db_mc_getDefaultNum(hContact:TMCONTACT):int; stdcall;

-                 external CoreDLL name 'db_mc_getDefaultNum';

+function db_mc_getDefaultNum(hContact:TMCONTACT):int; stdcall; external AppDLL;

 

 { returns a meta contact for a subcontact or 0 otherwise }

-function db_mc_getMeta(hContact:TMCONTACT):TMCONTACT; stdcall;

-                 external CoreDLL name 'db_mc_getMeta';

+function db_mc_getMeta(hContact:TMCONTACT):TMCONTACT; stdcall; external AppDLL;

 

 { returns a meta contact for a subcontact or hContact itself otherwise }

-function db_mc_tryMeta(hContact:TMCONTACT):TMCONTACT; stdcall;

-                 external CoreDLL name 'db_mc_tryMeta';

+function db_mc_tryMeta(hContact:TMCONTACT):TMCONTACT; stdcall; external AppDLL;

 

 { returns a subcontact with the given index or 0 }

-function db_mc_getSub(hContact:TMCONTACT; idx:int):TMCONTACT; stdcall;

-                 external CoreDLL name 'db_mc_getSub';

+function db_mc_getSub(hContact:TMCONTACT; idx:int):TMCONTACT; stdcall; external AppDLL;

+

+// gets the handle for the 'most online' contact

+function db_mc_getMostOnline(hMetaContact:TMCONTACT):TMCONTACT; stdcall; external AppDLL;

 

 { gets the number of subcontacts for a metacontact or -1 on error }

-function db_mc_getSubCount(hContact:TMCONTACT):int; stdcall;

-                 external CoreDLL name 'db_mc_getSubCount';

+function db_mc_getSubCount(hContact:TMCONTACT):int; stdcall; external AppDLL;

 

 { sets the default contact, using the subcontact's handle }

-function db_mc_setDefault(hContact,hSub:TMCONTACT; bWriteDb:bool):int; stdcall;

-                 external CoreDLL name 'db_mc_setDefault';

+function db_mc_setDefault(hContact,hSub:TMCONTACT; bWriteDb:bool):int; stdcall; external AppDLL;

 

 { sets the default contact, using the subcontact's number }

-function db_mc_setDefaultNum(hContact:TMCONTACT; idx:int; bWriteDb:bool):int; stdcall;

-                 external CoreDLL name 'db_mc_setDefaultNum';

+function db_mc_setDefaultNum(hContact:TMCONTACT; idx:int; bWriteDb:bool):int; stdcall; external AppDLL;

+

+// converts a given contact into a metacontact

+function db_mc_convertToMeta(hContact:TMCONTACT):int; stdcall; external AppDLL;

+

+// converts a given contact into a metacontact

+function db_mc_addToMeta(hContact,hMeta:TMCONTACT):int; stdcall; external AppDLL;

+

 {$ENDIF}

diff --git a/include/m_metacontacts.h b/include/m_metacontacts.h
index 730a9a32af..38b00d690d 100644
--- a/include/m_metacontacts.h
+++ b/include/m_metacontacts.h
@@ -30,12 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define META_PROTO   "MetaContacts"

 #define META_PROTOW L"MetaContacts"

 

-//gets the handle for the 'most online' contact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a handle to the 'most online' contact

-#define MS_MC_GETMOSTONLINECONTACT "MetaContacts/GetMostOnline"

-

 // fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set)

 // wParam=(HANDLE)hMetaContact

 // lParam=(HANDLE)hDefaultContact

@@ -52,26 +46,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // signalizes that metacontacts are enabled or disabled

 #define ME_MC_ENABLED "MetaContacts/OnEnabled"

 

-// wParam=(HANDLE)hContact

-// lParam=0

-// convert a given contact into a metacontact

-#define MS_MC_CONVERTTOMETA "MetaContacts/ConvertToMetacontact"

-

-// wParam=(HANDLE)hContact

-// lParam=(HANDLE)hMeta

-// add an existing contact to a metacontact

-#define MS_MC_ADDTOMETA "MetaContacts/AddToMetacontact"

-

-// wParam=0

-// lParam=(HANDLE)hContact

-// remove a contact from a metacontact

-#define MS_MC_REMOVEFROMMETA "MetaContacts/RemoveFromMetacontact"

-

-// wParam=(HANDLE)hContact

-// lParam=(HANDLE)hMeta

-// add an existing contact to a metacontact

-#define MS_MC_GETSRMMSUB "MetaContacts/GetSrmmSub"

-

 /////////////////////////////////////////////////////////////////////////////////////////

 // binary interface to MC

 

@@ -80,47 +54,54 @@ extern "C"
 {

 #endif

 

-MCONTACT __forceinline db_mc_getMostOnline(MCONTACT hContact)

-{	return CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);

-}

-

-MCONTACT __forceinline db_mc_getSrmmSub(MCONTACT hContact)

-{	return CallService(MS_MC_GETSRMMSUB, hContact, 0);

-}

-

 // checks whether metacontacts are enabled

-MIR_CORE_DLL(BOOL) db_mc_isEnabled(void);

-MIR_CORE_DLL(void) db_mc_enable(BOOL);

+MIR_APP_DLL(BOOL) db_mc_isEnabled(void);

+MIR_APP_DLL(void) db_mc_enable(BOOL);

 

 // checks whether a contact is a metacontact

-MIR_CORE_DLL(BOOL) db_mc_isMeta(MCONTACT hMetaContact);

+MIR_APP_DLL(BOOL) db_mc_isMeta(MCONTACT hMetaContact);

 

 // checks whether a contact is a subcontact of existing MC

-MIR_CORE_DLL(BOOL) db_mc_isSub(MCONTACT hSubContact);

+MIR_APP_DLL(BOOL) db_mc_isSub(MCONTACT hSubContact);

 

-//returns a handle to the default contact, or null on failure

-MIR_CORE_DLL(MCONTACT) db_mc_getDefault(MCONTACT hMetaContact);

+// returns a handle to the default contact, or null on failure

+MIR_APP_DLL(MCONTACT) db_mc_getDefault(MCONTACT hMetaContact);

 

-//returns the default contact number, or -1 on failure

-MIR_CORE_DLL(int) db_mc_getDefaultNum(MCONTACT hMetaContact);

+// returns the default contact number, or -1 on failure

+MIR_APP_DLL(int) db_mc_getDefaultNum(MCONTACT hMetaContact);

 

-//returns the number of subcontacts, or -1 on failure

-MIR_CORE_DLL(int) db_mc_getSubCount(MCONTACT hMetaContact);

+// returns the number of subcontacts, or -1 on failure

+MIR_APP_DLL(int) db_mc_getSubCount(MCONTACT hMetaContact);

 

 // returns parent hContact for a subcontact or NULL if it's not a sub

-MIR_CORE_DLL(MCONTACT) db_mc_getMeta(MCONTACT hSubContact);

+MIR_APP_DLL(MCONTACT) db_mc_getMeta(MCONTACT hSubContact);

 

 // returns parent hContact for a subcontact or hContact itself if it's not a sub

-MIR_CORE_DLL(MCONTACT) db_mc_tryMeta(MCONTACT hContact);

+MIR_APP_DLL(MCONTACT) db_mc_tryMeta(MCONTACT hContact);

 

 // returns a subcontact with the given index

-MIR_CORE_DLL(MCONTACT) db_mc_getSub(MCONTACT hMetaContact, int iNum);

+MIR_APP_DLL(MCONTACT) db_mc_getSub(MCONTACT hMetaContact, int iNum);

+

+// returns the default sub a SRMM window

+MIR_APP_DLL(MCONTACT) db_mc_getSrmmSub(MCONTACT hContact);

+

+// gets the handle for the 'most online' contact

+MIR_APP_DLL(MCONTACT) db_mc_getMostOnline(MCONTACT hContact);

+

+// sets the default contact, using the subcontact's handle

+MIR_APP_DLL(int) db_mc_setDefault(MCONTACT hMetaContact, MCONTACT hSub, BOOL bWriteDb);

+

+// sets the default contact, using the subcontact's number

+MIR_APP_DLL(int) db_mc_setDefaultNum(MCONTACT hMetaContact, int iNum, BOOL bWriteDb);

+

+// converts a contact into a meta

+MIR_APP_DLL(MCONTACT) db_mc_convertToMeta(MCONTACT hContact);

 

-//sets the default contact, using the subcontact's handle

-MIR_CORE_DLL(int) db_mc_setDefault(MCONTACT hMetaContact, MCONTACT hSub, BOOL bWriteDb);

+// adds a contact to meta

+MIR_APP_DLL(int) db_mc_addToMeta(MCONTACT hSub, MCONTACT hMetaContact);

 

-//sets the default contact, using the subcontact's number

-MIR_CORE_DLL(int) db_mc_setDefaultNum(MCONTACT hMetaContact, int iNum, BOOL bWriteDb);

+// removes a contact to meta

+MIR_APP_DLL(int) db_mc_removeFromMeta(MCONTACT hSub);

 

 #if defined(__cplusplus)

 }