Mercurial > pidgin.yaz
changeset 4918:553d96cb9b26
[gaim-migrate @ 5252]
You guys missed an awesome commit message, but CVS lost it. Sorry.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Mon, 31 Mar 2003 08:54:09 +0000 |
| parents | c0c6efda8151 |
| children | a1551892049c |
| files | src/buddy.c src/dialogs.c src/gtklist.h |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Mon Mar 31 07:51:01 2003 +0000 +++ b/src/buddy.c Mon Mar 31 08:54:09 2003 +0000 @@ -1336,7 +1336,9 @@ if (get_iter_from_node(node, &iter)) { gtk_tree_store_remove(gtkblist->treemodel, &iter); - if(GAIM_BLIST_NODE_IS_BUDDY(node) && gaim_blist_get_group_online_count((struct group *)node->parent) == 0) { + if(GAIM_BLIST_NODE_IS_BUDDY(node) && + !gtkblist->editmode && + gaim_blist_get_group_online_count((struct group *)node->parent) == 0) { GtkTreeIter groupiter; if(get_iter_from_node(node->parent, &groupiter)) gtk_tree_store_remove(gtkblist->treemodel, &groupiter);
--- a/src/dialogs.c Mon Mar 31 07:51:01 2003 +0000 +++ b/src/dialogs.c Mon Mar 31 08:54:09 2003 +0000 @@ -419,14 +419,15 @@ void do_remove_buddy(struct buddy *b) { - struct group *g = gaim_find_buddys_group(b); + struct group *g; struct gaim_conversation *c; - gchar *name = g_strdup(b->name); /* b->name is null after remove_buddy */ + gchar *name; if (!b) return; g = gaim_find_buddys_group(b); + name = g_strdup(b->name); /* b->name is null after remove_buddy */ debug_printf(_("Removing '%s' from buddy list.\n"), b->name); serv_remove_buddy(b->account->gc, name, g->name);
--- a/src/gtklist.h Mon Mar 31 07:51:01 2003 +0000 +++ b/src/gtklist.h Mon Mar 31 08:54:09 2003 +0000 @@ -52,7 +52,7 @@ GtkWidget *treeview; /**< It's a treeview... d'uh. */ GtkTreeStore *treemodel; /**< This is the treemodel. */ - gboolean *editmode; /**< TRUE if offline buddies are to be shown in the list. */ + gboolean editmode; /**< TRUE if offline buddies are to be shown in the list. */ GtkTreeViewColumn *idle_column, *warning_column,