summaryrefslogtreecommitdiff
path: root/plugins/MirandaG15/src/CContactList.cpp
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2015-06-08 21:10:58 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2015-06-08 21:10:58 +0000
commit00c46f24d60c9de29293bef608f34114392822d2 (patch)
tree23710e2cecfcea4df55587b2210de62acb4eeb7e /plugins/MirandaG15/src/CContactList.cpp
parent038f6cc65778c17300ce5c62bb25723f7fa16714 (diff)
MirandaG15:
- Minor fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@14068 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirandaG15/src/CContactList.cpp')
-rw-r--r--plugins/MirandaG15/src/CContactList.cpp8
1 files changed, 3 insertions, 5 deletions
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);
}
}