From: Nathan W. <fac...@us...> - 2003-06-13 17:55:08
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv4460/src Modified Files: blist.c gtkaccount.c Log Message: ok, this will get rid of the negative group counts for trepia, and also fixes the accounts dialog so signing off of an account leaves it signed off Index: blist.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/blist.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- blist.c 6 Jun 2003 16:53:22 -0000 1.28 +++ blist.c 13 Jun 2003 17:54:59 -0000 1.29 @@ -383,7 +383,7 @@ * being moved. */ ((struct group *)cnode->parent)->totalsize--; - if (chat->account->gc) { + if (gaim_account_is_connected(chat->account)) { ((struct group *)cnode->parent)->online--; ((struct group *)cnode->parent)->currentsize--; } @@ -407,7 +407,7 @@ cnode->parent = n->parent; n->next = cnode; ((struct group *)n->parent)->totalsize++; - if (chat->account->gc) { + if (gaim_account_is_connected(chat->account)) { ((struct group *)n->parent)->online++; ((struct group *)n->parent)->currentsize++; } @@ -419,7 +419,7 @@ ((GaimBlistNode*)g)->child = cnode; cnode->parent = (GaimBlistNode*)g; g->totalsize++; - if (chat->account->gc) { + if (gaim_account_is_connected(chat->account)) { g->online++; g->currentsize++; } @@ -458,7 +458,7 @@ * being moved. */ ((struct group *)bnode->parent)->totalsize--; - if (buddy->account->gc) + if (gaim_account_is_connected(buddy->account)) ((struct group *)bnode->parent)->currentsize--; if (GAIM_BUDDY_IS_ONLINE(buddy)) ((struct group *)bnode->parent)->online--; @@ -486,7 +486,7 @@ ((GaimBlistNode*)buddy)->parent = n->parent; n->next = (GaimBlistNode*)buddy; ((struct group *)n->parent)->totalsize++; - if (buddy->account->gc) + if (gaim_account_is_connected(buddy->account)) ((struct group *)n->parent)->currentsize++; if (GAIM_BUDDY_IS_ONLINE(buddy)) ((struct group *)n->parent)->online++; @@ -498,7 +498,7 @@ ((GaimBlistNode*)g)->child = (GaimBlistNode*)buddy; ((GaimBlistNode*)buddy)->parent = (GaimBlistNode*)g; g->totalsize++; - if (buddy->account->gc) + if (gaim_account_is_connected(buddy->account)) g->currentsize++; if (GAIM_BUDDY_IS_ONLINE(buddy)) g->online++; @@ -623,7 +623,7 @@ if (node->next) node->next->prev = node->prev; group->totalsize--; - if (buddy->account->gc) + if (gaim_account_is_connected(buddy->account)) group->currentsize--; if (GAIM_BUDDY_IS_ONLINE(buddy)) group->online--; @@ -664,7 +664,7 @@ if (node->next) node->next->prev = node->prev; group->totalsize--; - if (chat->account->gc) { + if (gaim_account_is_connected(chat->account)) { group->currentsize--; group->online--; } @@ -1236,7 +1236,8 @@ struct buddy *b = (struct buddy *)bnode; if(!GAIM_BLIST_NODE_IS_BUDDY(bnode)) continue; - if((!account && b->account->gc) || b->account == account) + if((!account && gaim_account_is_connected(b->account)) + || b->account == account) return TRUE; } return FALSE; Index: gtkaccount.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- gtkaccount.c 13 Jun 2003 09:42:07 -0000 1.63 +++ gtkaccount.c 13 Jun 2003 17:54:59 -0000 1.64 @@ -1504,10 +1504,12 @@ COLUMN_ONLINE, &online, -1); - if (online) + if (online) { + account->gc->wants_to_die = TRUE; gaim_account_disconnect(account); - else + } else { gaim_account_connect(account); + } } static void |