- "Add to metacontact" dialog fixed;

- "Remove from metacontact" menu item sometimes got hidden;
- code cleaning

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

1 files changed, 41 insertions, 41 deletions

diff --git a/src/modules/metacontacts/meta_api.cpp b/src/modules/metacontacts/meta_api.cpp
index 2cebf568be..d9417b9cca 100644
--- a/src/modules/metacontacts/meta_api.cpp
+++ b/src/modules/metacontacts/meta_api.cpp
@@ -24,10 +24,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "metacontacts.h"

 

-//gets the handle for the default contact

-//wParam=(MCONTACT)hMetaContact

-//lParam=0

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

+// gets the handle for the default contact

+// wParam=(MCONTACT)hMetaContact

+// lParam=0

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

 

 static INT_PTR MetaAPI_GetDefault(WPARAM hMetaContact, LPARAM)

 {

@@ -41,10 +41,10 @@ static INT_PTR MetaAPI_GetDefault(WPARAM hMetaContact, LPARAM)
 	return 0;

 }

 

-//gets the contact number for the default contact

-//wParam=(MCONTACT)hMetaContact

-//lParam=0

-//returns a DWORD contact number, or -1 on failure

+// gets the contact number for the default contact

+// wParam=(MCONTACT)hMetaContact

+// lParam=0

+// returns a DWORD contact number, or -1 on failure

 

 static INT_PTR MetaAPI_GetDefaultNum(WPARAM hMetaContact, LPARAM)

 {

@@ -52,10 +52,10 @@ static INT_PTR MetaAPI_GetDefaultNum(WPARAM hMetaContact, LPARAM)
 	return (cc == NULL) ? -1 : cc->nDefault;

 }

 

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

-//wParam=(MCONTACT)hMetaContact

-//lParam=0

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

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

+// wParam=(MCONTACT)hMetaContact

+// lParam=0

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

 

 static INT_PTR MetaAPI_GetMostOnline(WPARAM hMetaContact, LPARAM)

 {

@@ -66,10 +66,10 @@ static INT_PTR MetaAPI_GetMostOnline(WPARAM hMetaContact, LPARAM)
 	return Meta_GetMostOnline(cc);

 }

 

-//gets the number of subcontacts for a metacontact

-//wParam=(MCONTACT)hMetaContact

-//lParam=0

-//returns a DWORD representing the number of subcontacts for the given metacontact

+// gets the number of subcontacts for a metacontact

+// wParam=(MCONTACT)hMetaContact

+// lParam=0

+// returns a DWORD representing the number of subcontacts for the given metacontact

 

 static INT_PTR MetaAPI_GetNumContacts(WPARAM hMetaContact, LPARAM)

 {

@@ -77,10 +77,10 @@ static INT_PTR MetaAPI_GetNumContacts(WPARAM hMetaContact, LPARAM)
 	return (cc == NULL) ? -1 : cc->nSubs;

 }

 

-//gets the handle of a subcontact, using the subcontact's number

-//wParam=(MCONTACT)hMetaContact

-//lParam=(DWORD)contact number

-//returns a handle to the specified subcontact

+// gets the handle of a subcontact, using the subcontact's number

+// wParam=(MCONTACT)hMetaContact

+// lParam=(DWORD)contact number

+// returns a handle to the specified subcontact

 

 static INT_PTR MetaAPI_GetContact(WPARAM hMetaContact, LPARAM lParam)

 {

@@ -88,10 +88,10 @@ static INT_PTR MetaAPI_GetContact(WPARAM hMetaContact, LPARAM lParam)
 	return (cc == NULL) ? 0 : Meta_GetContactHandle(cc, lParam);

 }

 

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

-//wParam=(MCONTACT)hMetaContact

-//lParam=(DWORD)contact number

-//returns 0 on success

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

+// wParam=(MCONTACT)hMetaContact

+// lParam=(DWORD)contact number

+// returns 0 on success

 

 static INT_PTR MetaAPI_SetDefaultContactNum(WPARAM hMetaContact, LPARAM lParam)

 {

@@ -108,10 +108,10 @@ static INT_PTR MetaAPI_SetDefaultContactNum(WPARAM hMetaContact, LPARAM lParam)
 	return 0;

 }

 

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

-//wParam=(MCONTACT)hMetaContact

-//lParam=(MCONTACT)hSubcontact

-//returns 0 on success

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

+// wParam=(MCONTACT)hMetaContact

+// lParam=(MCONTACT)hSubcontact

+// returns 0 on success

 

 static INT_PTR MetaAPI_SetDefaultContact(WPARAM hMetaContact, LPARAM lParam)

 {

@@ -130,10 +130,10 @@ static INT_PTR MetaAPI_SetDefaultContact(WPARAM hMetaContact, LPARAM lParam)
 	return 0;

 }

 

-//forces the metacontact to send using a specific subcontact, using the subcontact's contact number

-//wParam=(MCONTACT)hMetaContact

-//lParam=(DWORD)contact number

-//returns 0 on success

+// forces the metacontact to send using a specific subcontact, using the subcontact's contact number

+// wParam=(MCONTACT)hMetaContact

+// lParam=(DWORD)contact number

+// returns 0 on success

 

 static INT_PTR MetaAPI_ForceSendContactNum(WPARAM hMetaContact, LPARAM lParam)

 {

@@ -151,10 +151,10 @@ static INT_PTR MetaAPI_ForceSendContactNum(WPARAM hMetaContact, LPARAM lParam)
 	return 0;

 }

 

-//forces the metacontact to send using a specific subcontact, using the subcontact's handle

-//wParam=(MCONTACT)hMetaContact

-//lParam=(MCONTACT)hSubcontact

-//returns 0 on success (will fail if 'force default' is in effect)

+// forces the metacontact to send using a specific subcontact, using the subcontact's handle

+// wParam=(MCONTACT)hMetaContact

+// lParam=(MCONTACT)hSubcontact

+// returns 0 on success (will fail if 'force default' is in effect)

 

 static INT_PTR MetaAPI_ForceSendContact(WPARAM hMetaContact, LPARAM lParam)

 {

@@ -174,10 +174,10 @@ static INT_PTR MetaAPI_ForceSendContact(WPARAM hMetaContact, LPARAM lParam)
 	return 0;

 }

 

-//'unforces' the metacontact to send using a specific subcontact

-//wParam=(MCONTACT)hMetaContact

-//lParam=0

-//returns 0 on success (will fail if 'force default' is in effect)

+// 'unforces' the metacontact to send using a specific subcontact

+// wParam=(MCONTACT)hMetaContact

+// lParam=0

+// returns 0 on success (will fail if 'force default' is in effect)

 

 INT_PTR MetaAPI_UnforceSendContact(WPARAM hMetaContact, LPARAM lParam)

 {

@@ -259,7 +259,7 @@ static INT_PTR MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam)
 static INT_PTR MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam)

 {

 	// notice we switch args - to keep the API function consistent with the others

-	return Meta_Delete((WPARAM)lParam, (LPARAM)wParam);

+	return Meta_Delete(lParam, wParam);

 }

 

 void CreateApiServices()