diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-27 21:51:46 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-27 21:51:46 +0000 |
| commit | 1fb0cd07fba1e8d6f9ac2ebe3b4f2e1c60acb81b (patch) | |
| tree | 904c95b33e03e806aea734552281257768273a14 /src/modules/metacontacts | |
| parent | a8e8aebfd4f53977873c72c2d828c2c1f505f10d (diff) | |
- metacontacts are always present;
- added META_PROTO constant for mc module name;
- MS_MC_GETPROTOCOLNAME removed, because it always returns META_PROTO
git-svn-id: http://svn.miranda-ng.org/main/trunk@8319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/metacontacts')
| -rw-r--r-- | src/modules/metacontacts/meta_api.cpp | 11 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_services.cpp | 1 | ||||
| -rw-r--r-- | src/modules/metacontacts/metacontacts.h | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/modules/metacontacts/meta_api.cpp b/src/modules/metacontacts/meta_api.cpp index 66760b2442..701540deae 100644 --- a/src/modules/metacontacts/meta_api.cpp +++ b/src/modules/metacontacts/meta_api.cpp @@ -177,21 +177,16 @@ INT_PTR MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) { }
MCONTACT hContact = (MCONTACT)db_get_dw(hMeta, META_PROTO, "ForceSend", 0);
- if ( !hContact) {
+ if (!hContact) {
if (lParam) *(DWORD *)lParam = -1;
- } else {
+ }
+ else {
if (lParam) *(DWORD *)lParam = (DWORD)Meta_GetContactNumber(hContact);
}
return 0;
}
-// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)
-// wParam=lParam=0
-INT_PTR MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {
- return (INT_PTR)META_PROTO;
-}
-
// added 0.9.5.0 (22/3/05)
// wParam=(HANDLE)hContact
// lParam=0
diff --git a/src/modules/metacontacts/meta_services.cpp b/src/modules/metacontacts/meta_services.cpp index 73b65cea79..04f3157e44 100644 --- a/src/modules/metacontacts/meta_services.cpp +++ b/src/modules/metacontacts/meta_services.cpp @@ -1223,7 +1223,6 @@ void Meta_InitServices() CreateServiceFunction(MS_MC_FORCESENDCONTACTNUM, MetaAPI_ForceSendContactNum);
CreateServiceFunction(MS_MC_FORCESENDCONTACT, MetaAPI_ForceSendContact);
CreateServiceFunction(MS_MC_UNFORCESENDCONTACT, MetaAPI_UnforceSendContact);
- CreateServiceFunction(MS_MC_GETPROTOCOLNAME, MetaAPI_GetProtoName);
CreateServiceFunction(MS_MC_GETFORCESTATE, MetaAPI_GetForceState);
CreateServiceFunction(MS_MC_CONVERTTOMETA, MetaAPI_ConvertToMeta);
diff --git a/src/modules/metacontacts/metacontacts.h b/src/modules/metacontacts/metacontacts.h index cce2686c09..9124312302 100644 --- a/src/modules/metacontacts/metacontacts.h +++ b/src/modules/metacontacts/metacontacts.h @@ -20,7 +20,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define META_PROTO "MetaContacts"
#define META_FILTER "MetaContactsFilter"
#define META_ID "MetaID"
#define META_FILTER_ID "MetaFilterID"
|