From 9613f96e6a6f96ad02a0fc926054132811ae2bb1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 3 Apr 2018 16:30:25 +0300 Subject: Accounts() : iterator for accounts --- plugins/Clist_nicer/src/extBackg.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'plugins/Clist_nicer/src/extBackg.cpp') diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 7b8ff8a8ff..fb674e4b5e 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -277,20 +277,17 @@ void LoadExtBkSettingsFromDB() arStatusItems.insert(p); } - int protoCount; - PROTOACCOUNT **accs; - Proto_EnumAccounts(&protoCount, &accs); - - for (int i = 0; i < protoCount; i++) { + auto &accs = Accounts(); + for (auto &pa : accs) { StatusItems_t *p = (StatusItems_t*)mir_alloc(sizeof(StatusItems_t)); *p = _StatusItems[0]; ID_EXTBK_LAST++; - mir_snprintf(p->szDBname, "EXBK_%s", accs[i]->szModuleName); - if (i == 0) - mir_snprintf(p->szName, "{-}%s", accs[i]->szModuleName); + mir_snprintf(p->szDBname, "EXBK_%s", pa->szModuleName); + if (accs.indexOf(&pa) == 0) + mir_snprintf(p->szName, "{-}%s", pa->szModuleName); else - strncpy_s(p->szName, accs[i]->szModuleName, _TRUNCATE); + strncpy_s(p->szName, pa->szModuleName, _TRUNCATE); p->statusID = ID_EXTBK_LAST; arStatusItems.insert(p); } -- cgit v1.2.3