divelist: add 'Expand all' and 'Collapse all' menu items

[ext/subsurface.git] / statistics.c

diff --git a/statistics.c b/statistics.c
index 3a260066a259d58c2305ace1255f88e7f829e66f..0f6fbe0478c2056a27107ac4d7044613bc296a79 100644 (file)
--- a/statistics.c
+++ b/statistics.c
@@ -146,34 +146,20 @@ static void process_all_dives(struct dive *dive, struct dive **prev_dive)
 void process_selected_dives(GList *selected_dives, int *selectiontracker, GtkTreeModel *model)
 {
        struct dive *dp;
-       unsigned int i, j;
+       unsigned int i;
        int idx;
-       GtkTreeIter iter;
-       GtkTreePath *path;
 
        memset(&stats_selection, 0, sizeof(stats_selection));
 
-       /* adjust amount_selected and remove negative index entries from list */
-       for (i = 0, j = 0; j < amount_selected; ++i) {
-               GValue value = {0, };
-               path = g_list_nth_data(selected_dives, i);
-               if (gtk_tree_model_get_iter(model, &iter, path)) {
-                       gtk_tree_model_get_value(model, &iter, 0, &value);
-                       idx = g_value_get_int(&value);
-                       if (idx > 0) {
-                               dp = get_dive(idx);
-                               if (dp) {
-                                       selectiontracker[j] = idx;
-                                       process_dive(dp, &stats_selection);
-                                       j++;
-                                       continue;
-                               }
+       for (i = 0; i < amount_selected; ++i) {
+               idx = selectiontracker[i];
+               if (idx > 0) {
+                       dp = get_dive(idx);
+                       if (dp) {
+                               process_dive(dp, &stats_selection);
                        }
                }
-               /* we didn't process it, so shorten the list */
-               amount_selected--;
        }
-       /* record the actual number of dives selected */
        stats_selection.selection_size = amount_selected;
 }
 
@@ -288,10 +274,7 @@ static void show_total_dive_stats(struct dive *dive)
        const char *unit;
        stats_t *stats_ptr;
 
-       if (amount_selected < 2)
-               stats_ptr = &stats;
-       else
-               stats_ptr = &stats_selection;
+       stats_ptr = &stats_selection;
 
        set_label(stats_w.selection_size, "%d", stats_ptr->selection_size);
        if (stats_ptr->min_temp) {