diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-05-17 19:23:37 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-05-17 19:23:37 +0000 |
| commit | 1d9fd398b75a5a6eca9d40db2e2abb60c96ebc7d (patch) | |
| tree | 8d216553e534f6f34be4374741709aba73fc1739 /protocols/JabberG/src | |
| parent | c2914d5759e0ba8a3b9a81c8a1f071dba90094b4 (diff) | |
some more fixes for MS_DB_CONTACT_DELETE & loops
git-svn-id: http://svn.miranda-ng.org/main/trunk@4710 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 3dbfd2d69d..104470416d 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -492,10 +492,8 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo* pInfo) db_unset(hContact, "CList", "Hidden");
chatRooms.insert(hContact);
- } else
- {
- UpdateSubscriptionInfo(hContact, item);
}
+ else UpdateSubscriptionInfo(hContact, item);
if ( !m_options.IgnoreRosterGroups) {
if (item->group != NULL) {
@@ -533,32 +531,15 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo* pInfo) // Delete orphaned contacts (if roster sync is enabled)
if (m_options.RosterSync == TRUE) {
- int listSize = 0, listAllocSize = 0;
- HANDLE* list = NULL;
- for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
- DBVARIANT dbv;
- if ( !JGetStringT(hContact, "jid", &dbv)) {
- if ( !ListExist(LIST_ROSTER, dbv.ptszVal)) {
- Log("Syncing roster: preparing to delete %S (hContact=0x%x)", dbv.ptszVal, hContact);
- if (listSize >= listAllocSize) {
- listAllocSize = listSize + 100;
- if ((list=(HANDLE *) mir_realloc(list, listAllocSize * sizeof(HANDLE))) == NULL) {
- listSize = 0;
- break;
- } }
-
- list[listSize++] = hContact;
- }
- db_free(&dbv);
+ for (HANDLE hContact = db_find_first(m_szModuleName); hContact; ) {
+ HANDLE hNext = db_find_next(hContact, m_szModuleName);
+ ptrT jid( db_get_tsa(hContact, m_szModuleName, "jid"));
+ if (jid != NULL && !ListExist(LIST_ROSTER, jid)) {
+ Log("Syncing roster: preparing to delete %S (hContact=0x%x)", jid, hContact);
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);
}
+ hContact = hNext;
}
-
- for (i=0; i < listSize; i++) {
- Log("Syncing roster: deleting 0x%x", list[i]);
- CallService(MS_DB_CONTACT_DELETE, (WPARAM)list[i], 0);
- }
- if (list != NULL)
- mir_free(list);
}
EnableMenuItems(TRUE);
@@ -567,10 +548,10 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo* pInfo) m_bModeMsgStatusChangePending = FALSE;
SetServerStatus(m_iDesiredStatus);
- if (m_options.AutoJoinConferences) {
+ if (m_options.AutoJoinConferences)
for (i=0; i < chatRooms.getCount(); i++)
GroupchatJoinByHContact((HANDLE)chatRooms[i], true);
- }
+
chatRooms.destroy();
//UI_SAFE_NOTIFY(m_pDlgJabberJoinGroupchat, WM_JABBER_CHECK_ONLINE);
|