shameful end of the group processing zoo, part 1

git-svn-id: http://svn.miranda-ng.org/main/trunk@5994 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 1 insertions, 25 deletions

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index abe3a5dead..a0b7704844 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -642,7 +642,6 @@ protected:
 	void CListResetOptions(HWND hwndList);

 	void CListFilter(HWND hwndList);

 	bool CListIsGroup(HANDLE hGroup);

-	HANDLE CListFindGroupByName(TCHAR *name);

 	void CListResetIcons(HWND hwndList, HANDLE hItem, bool hide=false);

 	void CListSetupIcons(HWND hwndList, HANDLE hItem, int iSlot, DWORD dwProcess, BOOL bAction);

 	HANDLE CListAddContact(HWND hwndList, TCHAR *jid);

@@ -1373,29 +1372,6 @@ bool CJabberDlgPrivacyLists::CListIsGroup(HANDLE hGroup)
 	return result;

 }

 

-HANDLE CJabberDlgPrivacyLists::CListFindGroupByName(TCHAR *name)

-{

-	char idstr[33];

-	DBVARIANT dbv;

-

-	HANDLE hGroup = 0;

-

-	for (int i= 0; !hGroup; i++)

-	{

-		_itoa(i, idstr, 10);

-

-		if ( db_get_ts(NULL, "CListGroups", idstr, &dbv))

-			break;

-

-		if ( !_tcscmp(dbv.ptszVal + 1, name))

-			hGroup = (HANDLE)(i+1);

-

-		db_free(&dbv);

-	}

-

-	return hGroup;

-}

-

 void CJabberDlgPrivacyLists::CListResetIcons(HWND, HANDLE hItem, bool hide)

 {

 	for (int i = 0; i < 4; i++)

@@ -1477,7 +1453,7 @@ void CJabberDlgPrivacyLists::CListApplyList(HWND hwndList, CPrivacyList *pList)
 			}

 			case Group:

 			{

-				HANDLE hGroup = CListFindGroupByName(pRule->GetValue());

+				HANDLE hGroup = Clist_GroupExists(pRule->GetValue());

 				hItem = m_clcClist.FindGroup(hGroup);

 				break;

 			}