From 976d66eafcc8f1005b74e30ef43b13eedcb473ab Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Dec 2012 14:40:55 +0000 Subject: we don't remove jabber avatars when it's not needed git-svn-id: http://svn.miranda-ng.org/main/trunk@2722 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_list.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'protocols/JabberG/src/jabber_list.cpp') diff --git a/protocols/JabberG/src/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp index 29cc4ce200..28608e5121 100644 --- a/protocols/JabberG/src/jabber_list.cpp +++ b/protocols/JabberG/src/jabber_list.cpp @@ -49,27 +49,29 @@ static void JabberListFreeItemInternal(JABBER_LIST_ITEM *item) if (item == NULL) return; - if (item->jid) mir_free(item->jid); - if (item->nick) mir_free(item->nick); - JABBER_RESOURCE_STATUS* r = item->resource; for (int i=0; i < item->resourceCount; i++, r++) JabberListFreeResourceInternal(r); - if (item->resource) mir_free(item->resource); JabberListFreeResourceInternal(&item->itemResource); - if (item->group) mir_free(item->group); if (item->photoFileName) { - DeleteFile(item->photoFileName); + if (item->list == LIST_VCARD_TEMP) + DeleteFile(item->photoFileName); mir_free(item->photoFileName); } - if (item->messageEventIdStr) mir_free(item->messageEventIdStr); - if (item->name) mir_free(item->name); - if (item->type) mir_free(item->type); - if (item->service) mir_free(item->service); - if (item->password) mir_free(item->password); - if (item->list==LIST_ROSTER && item->ft) delete item->ft; + + mir_free(item->jid); + mir_free(item->nick); + mir_free(item->resource); + mir_free(item->group); + mir_free(item->messageEventIdStr); + mir_free(item->name); + mir_free(item->type); + mir_free(item->service); + mir_free(item->password); + if (item->list == LIST_ROSTER && item->ft) + delete item->ft; mir_free(item); } -- cgit v1.2.3