diff options
author | George Hazan <george.hazan@gmail.com> | 2014-04-08 17:54:19 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2014-04-08 17:54:19 +0000 |
commit | 78dc54f9e392b45492a2b726d6268c41f594eb41 (patch) | |
tree | fa1180153a3ac3610f22ad9f7b002d2a348c2ea5 /plugins/Clist_mw/src/clistmod.cpp | |
parent | afa73da4259ee9a00e60570031f94338542636d8 (diff) |
bunch of mc related fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@8892 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_mw/src/clistmod.cpp')
-rw-r--r-- | plugins/Clist_mw/src/clistmod.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/Clist_mw/src/clistmod.cpp b/plugins/Clist_mw/src/clistmod.cpp index ce81fee4bc..7c998de4db 100644 --- a/plugins/Clist_mw/src/clistmod.cpp +++ b/plugins/Clist_mw/src/clistmod.cpp @@ -41,7 +41,6 @@ extern BYTE nameOrder[]; static HANDLE hSettingChanged, hProtoAckHook;
-/////////// End by FYR ////////
int cli_IconFromStatusMode(const char *szProto,int nStatus, MCONTACT hContact)
{
int result = -1;
@@ -49,7 +48,7 @@ int cli_IconFromStatusMode(const char *szProto,int nStatus, MCONTACT hContact) char * szActProto = (char*)szProto;
int nActStatus = nStatus;
MCONTACT hActContact = hContact;
- if ( !db_get_b(NULL,"CLC","Meta",0) && !strcmp(szActProto,"MetaContacts")) {
+ if (!db_get_b(NULL, "CLC", "Meta", 0) && !strcmp(szActProto, META_PROTO)) {
// substitute params by mostonline contact datas
MCONTACT hMostOnlineContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hActContact, 0);
if (hMostOnlineContact && hMostOnlineContact != (MCONTACT)CALLSERVICE_NOTFOUND) {
@@ -67,14 +66,12 @@ int cli_IconFromStatusMode(const char *szProto,int nStatus, MCONTACT hContact) // result == -1 means no Advanced icon. LOWORD(result) == 0 happens when Advanced icon returned by ICQ (i.e. no transpot)
if (result == -1 || !(LOWORD(result)))
- result = saveIconFromStatusMode(szActProto,nActStatus,NULL);
+ result = saveIconFromStatusMode(szActProto, nActStatus, NULL);
}
- else result = saveIconFromStatusMode(szProto,nStatus,NULL);
+ else result = saveIconFromStatusMode(szProto, nStatus, NULL);
return result;
}
-
-////////// By FYR/////////////
int ExtIconFromStatusMode(MCONTACT hContact, const char *szProto,int status)
{
/* if ( db_get_b( NULL, "CLC", "Meta", 0 ) == 1 )
|