comparison src/gtkblist.c @ 8960:7c008d98ef33

[gaim-migrate @ 9734] this was decidedly easy to do committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Mon, 17 May 2004 02:40:04 +0000
parents e3f4657fa555
children 574393ccd705
comparison
equal deleted inserted replaced
8959:bfc8dea58386 8960:7c008d98ef33
2131 return FALSE; 2131 return FALSE;
2132 2132
2133 gtknode = node->ui_data; 2133 gtknode = node->ui_data;
2134 2134
2135 if (node->child && GAIM_BLIST_NODE_IS_CONTACT(node) && 2135 if (node->child && GAIM_BLIST_NODE_IS_CONTACT(node) &&
2136 ((GaimContact*)node)->online > 1 && !gtknode->contact_expanded && 2136 (((GaimContact*)node)->online > 1 ||
2137 (gaim_blist_node_get_bool(node, "show_offline") &&
2138 ((GaimContact*)node)->currentsize > 1)) &&
2139 !gtknode->contact_expanded &&
2137 gaim_prefs_get_bool("/gaim/gtk/blist/auto_expand_contacts")) { 2140 gaim_prefs_get_bool("/gaim/gtk/blist/auto_expand_contacts")) {
2138 GtkTreeIter i; 2141 GtkTreeIter i;
2139 gaim_gtk_blist_expand_contact_cb(NULL, node); 2142 gaim_gtk_blist_expand_contact_cb(NULL, node);
2140 tooltip_top = TRUE; /* When the person expands, the new screennames will be below. 2143 tooltip_top = TRUE; /* When the person expands, the new screennames will be below.
2141 We'll draw the tip above the cursor so that the user can see 2144 We'll draw the tip above the cursor so that the user can see
3625 contact = (GaimContact*)node; 3628 contact = (GaimContact*)node;
3626 buddy = gaim_contact_get_priority_buddy(contact); 3629 buddy = gaim_contact_get_priority_buddy(contact);
3627 3630
3628 if(buddy && (buddy->present != GAIM_BUDDY_OFFLINE || 3631 if(buddy && (buddy->present != GAIM_BUDDY_OFFLINE ||
3629 (gaim_account_is_connected(buddy->account) && 3632 (gaim_account_is_connected(buddy->account) &&
3630 gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")))) { 3633 gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) ||
3634 gaim_blist_node_get_bool(node, "show_offline"))) {
3631 GtkTreeIter iter; 3635 GtkTreeIter iter;
3632 3636
3633 if(!insert_node(list, node, &iter)) 3637 if(!insert_node(list, node, &iter))
3634 return; 3638 return;
3635 3639
3678 gaim_gtk_blist_update_contact(list, node->parent); 3682 gaim_gtk_blist_update_contact(list, node->parent);
3679 3683
3680 if(gtkparentnode->contact_expanded && 3684 if(gtkparentnode->contact_expanded &&
3681 (buddy->present != GAIM_BUDDY_OFFLINE || 3685 (buddy->present != GAIM_BUDDY_OFFLINE ||
3682 (gaim_account_is_connected(buddy->account) && 3686 (gaim_account_is_connected(buddy->account) &&
3683 gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")))) { 3687 gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies")) ||
3688 gaim_blist_node_get_bool(node->parent, "show_offline"))) {
3684 GtkTreeIter iter; 3689 GtkTreeIter iter;
3685 3690
3686 if(!insert_node(list, node, &iter)) 3691 if(!insert_node(list, node, &iter))
3687 return; 3692 return;
3688 3693