From 00c46f24d60c9de29293bef608f34114392822d2 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Mon, 8 Jun 2015 21:10:58 +0000 Subject: MirandaG15: - Minor fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@14068 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirandaG15/src/CContactList.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'plugins/MirandaG15/src/CContactList.cpp') diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp index 7b99448c12..fdaacbbe85 100644 --- a/plugins/MirandaG15/src/CContactList.cpp +++ b/plugins/MirandaG15/src/CContactList.cpp @@ -1003,14 +1003,14 @@ void CContactList::InitializeGroupObjects() int res = 0; CContactListGroup *pGroup = NULL; - MCONTACT hContact = db_find_first(); + HANDLE hMetaContact = NULL; char *szProto = NULL; - while(hContact != NULL) + for(MCONTACT hContact = db_find_first();hContact != NULL;hContact = db_find_next(hContact)) { tstring strGroup = GetContactGroupPath(hContact); szProto = GetContactProto(hContact); - if(szProto && db_get_b(NULL,"MetaContacts","Enabled",1) && !mir_strcmpi(szProto,"MetaContacts")) + if(szProto && db_get_b(NULL,META_PROTO,"Enabled",1) && !mir_strcmpi(szProto,META_PROTO)) { tstring strName = CAppletManager::GetContactDisplayname(hContact); tstring strPath = _T(""); @@ -1037,8 +1037,6 @@ void CContactList::InitializeGroupObjects() if(!db_mc_isSub(hContact)) ChangeGroupObjectCounters(strGroup,1); } - - hContact = db_find_next(hContact); } } -- cgit v1.2.3