# HG changeset patch # User Richard Laager # Date 1135071694 0 # Node ID f1ee8a29bd693faab854b12e3a53fb42c4ac5c83 # Parent 1246935dd047b4992b0f64b918e004e66fed8e32 [gaim-migrate @ 14899] I need to be able to destroy GaimChats that aren't attached to a group. committer: Tailor Script diff -r 1246935dd047 -r f1ee8a29bd69 src/blist.c --- a/src/blist.c Tue Dec 20 09:35:56 2005 +0000 +++ b/src/blist.c Tue Dec 20 09:41:34 2005 +0000 @@ -1830,22 +1830,25 @@ gnode = node->parent; group = (GaimGroup *)gnode; - /* Remove the node from its parent */ - if (gnode->child == node) - gnode->child = node->next; - if (node->prev) - node->prev->next = node->next; - if (node->next) - node->next->prev = node->prev; - - /* Adjust size counts */ - if (gaim_account_is_connected(chat->account)) { - group->online--; - group->currentsize--; + if (gnode != NULL) + { + /* Remove the node from its parent */ + if (gnode->child == node) + gnode->child = node->next; + if (node->prev) + node->prev->next = node->next; + if (node->next) + node->next->prev = node->prev; + + /* Adjust size counts */ + if (gaim_account_is_connected(chat->account)) { + group->online--; + group->currentsize--; + } + group->totalsize--; + + gaim_blist_schedule_save(); } - group->totalsize--; - - gaim_blist_schedule_save(); /* Update the UI */ if (ops && ops->remove)