From 283b4ae7cb3ca185b9a9eb1e629b9f7278be55de Mon Sep 17 00:00:00 2001 From: sje Date: Thu, 11 Oct 2007 08:42:39 +0000 Subject: more fixes for hard-coded metacontact protocol name git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@365 4f64403b-2f21-0410-a795-97e2b3489a10 --- otr/options.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'otr/options.cpp') diff --git a/otr/options.cpp b/otr/options.cpp index 4334362..055507a 100644 --- a/otr/options.cpp +++ b/otr/options.cpp @@ -229,7 +229,7 @@ INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar CallService(MS_PROTO_ENUMPROTOCOLS, (LPARAM)&num_protocols, (WPARAM)&pppDesc); HWND hw = GetDlgItem(hwndDlg, IDC_LIST_PROTOS); for(int i = 0; i < num_protocols; i++) { - if(pppDesc[i]->type == PROTOTYPE_PROTOCOL && strcmp(pppDesc[i]->szName, "MetaContacts") != 0 + if(pppDesc[i]->type == PROTOTYPE_PROTOCOL && (metaproto == 0 || strcmp(pppDesc[i]->szName, metaproto) != 0) && CallProtoService(pppDesc[i]->szName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM == PF1_IM) { SendMessage(hw, LB_INSERTSTRING, (WPARAM)-1, (LPARAM)pppDesc[i]->szName); @@ -265,7 +265,7 @@ INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar { proto = ( char* )CallService( MS_PROTO_GETCONTACTBASEPROTO, ( WPARAM )hContact,0 ); if(proto && DBGetContactSettingByte(hContact, proto, "ChatRoom", 0) == 0 && CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)MODULE) // ignore chatrooms - && (proto && strcmp(proto, "MetaContacts") != 0)) // and MetaContacts + && (metaproto == 0 || strcmp(proto, metaproto) != 0)) // and MetaContacts { lvI.iSubItem = 0; lvI.lParam = (LPARAM)hContact; -- cgit v1.2.3