From 874390a8376202f138266bdd641e810db93a3136 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Thu, 2 May 2002 20:32:19 +0000 Subject: Added this function that lets you specify the translation domain. 2002-05-02 Christopher James Lahey * gal/widgets/e-popup-menu.c, gal/widgets/e-popup-menu.h (e_popup_menu_create_with_domain): Added this function that lets you specify the translation domain. From gal/e-table/ChangeLog: 2002-05-02 Christopher James Lahey * e-table-click-to-add.c (finish_editing): Add horizontal dividers here too. * e-table-config.c (create_global_store): Translate column headers here. * e-table-header-item.c (ethi_header_context_menu): Use e_popup_menu_create_with_domain here. * e-table-header-utils.c (e_table_header_draw_button): Translate from utf8 here before drawing. * e-table-memory-store.c, e-table-memory-store.h (e_table_memory_store_insert_adopt_array): Changed the name of this function from e_table_memory_store_insert_adopt. (e_table_memory_store_insert_adopt): Added this function which takes a ... list. * e-table-utils.c (et_col_spec_to_col): Translate column titles to utf8 here. svn path=/trunk/; revision=16668 --- widgets/table/e-tree-selection-model.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'widgets/table/e-tree-selection-model.c') diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index c7799313f4..4e1b626259 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -887,13 +887,14 @@ etsm_selected_count_recurse (ETreeSelectionModel *etsm, etsm_selected_count_all_recurse(etsm, path, count); return; } - if (!selection_node->any_children_selected) - return; if (selection_node->selected) { (*count) ++; } + if (!selection_node->any_children_selected) + return; + if (selection_node->children) { ETreePath child = e_tree_model_node_get_first_child(E_TREE_MODEL(etsm->priv->model), path); int i; @@ -955,10 +956,8 @@ etsm_select_all (ESelectionModel *selection) etsm->priv->root->any_children_selected = TRUE; e_tree_selection_model_node_fill_children(etsm, root, etsm->priv->root); - etsm->priv->root->all_children_selected_array = e_bit_array_new(etsm->priv->root->num_children); - etsm->priv->root->any_children_selected_array = e_bit_array_new(etsm->priv->root->num_children); - e_bit_array_select_all(etsm->priv->root->all_children_selected_array); - e_bit_array_select_all(etsm->priv->root->any_children_selected_array); + etsm->priv->root->all_children_selected_array = NULL; + etsm->priv->root->any_children_selected_array = NULL; if (etsm->priv->cursor_col == -1) etsm->priv->cursor_col = 0; -- cgit v1.2.3