mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't do "remove_trip()" by walking the gtk data structures

Browse source 
They are complicated and confusing.  Just use our own data structures
and re-generate the gtk ones from them.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-02-19 09:57:54 -08:00 committed by Dirk Hohndel
parent 95f5098bcb
commit 97bd24246e
1 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
divelist.c
View file

@ -1158,7 +1158,7 @@ static void remove_dive_from_trip(struct dive *dive)
next->pprev = pprev; next->pprev = pprev;
dive->divetrip = NULL; dive->divetrip = NULL;
dive->tripflag = TF_NONE; dive->tripflag = NO_TRIP;
assert(trip->nrdives > 0); assert(trip->nrdives > 0);
if (!--trip->nrdives) if (!--trip->nrdives)
delete_trip(trip); delete_trip(trip);
@ -1961,7 +1961,6 @@ static void remove_from_trip(GtkTreePath *path)
gtk_tree_store_remove(STORE(dive_list), &parent); gtk_tree_store_remove(STORE(dive_list), &parent);
} }
/* mark the dive as intentionally at the top level */ /* mark the dive as intentionally at the top level */
dive->tripflag = NO_TRIP;
remove_dive_from_trip(dive); remove_dive_from_trip(dive);
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP
dump_trip_list(); dump_trip_list();
@ -2030,40 +2029,29 @@ static void remove_from_trip_cb(GtkWidget *menuitem, GtkTreePath *path)
mark_divelist_changed(TRUE); mark_divelist_changed(TRUE);
} }
static void remove_trip(GtkTreePath *trippath, gboolean force_no_trip) static void remove_trip(GtkTreePath *trippath)
{ {
GtkTreeIter newiter, parent, child, *lastiter = &parent; int idx, i;
GtkTreeIter iter;
dive_trip_t *trip;
struct dive *dive; struct dive *dive;
int idx;
GtkTreePath *childpath;
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
/* what a pain - we can't just move the nodes, we have to gtk_tree_model_get_iter(MODEL(dive_list), &iter, trippath);
* create new ones and delete the existing ones instead */ gtk_tree_model_get(MODEL(dive_list), &iter, DIVE_INDEX, &idx, -1);
gtk_tree_model_get_iter(MODEL(dive_list), &parent, trippath); trip = find_trip_by_idx(idx);
childpath = gtk_tree_path_copy(trippath); if (!trip)
gtk_tree_path_down(childpath); return;
for (;;) {
if ( ! gtk_tree_model_get_iter(MODEL(dive_list), &child, childpath)) remember_tree_state();
break; for_each_dive(i, dive) {
gtk_tree_store_insert_after(STORE(dive_list), &newiter, NULL, lastiter); if (dive->divetrip != trip)
copy_tree_node(&child, &newiter); continue;
/* we need to track what was selected */
gtk_tree_model_get(MODEL(dive_list), &child, DIVE_INDEX, &idx, -1);
dive = get_dive(idx);
if (dive->selected)
gtk_tree_selection_select_iter(selection, &newiter);
if (force_no_trip)
dive->tripflag = NO_TRIP;
else
dive->tripflag = TF_NONE;
remove_dive_from_trip(dive); remove_dive_from_trip(dive);
/* this removes the child - now childpath points to the next child */
gtk_tree_store_remove(STORE(dive_list), &child);
lastiter = &newiter;
} }
/* finally, remove the trip */
gtk_tree_store_remove(STORE(dive_list), &parent); dive_list_update_dives();
restore_tree_state();
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP
dump_trip_list(); dump_trip_list();
#endif #endif
@ -2087,7 +2075,7 @@ static void remove_trip_cb(GtkWidget *menuitem, GtkTreePath *trippath)
if (!success) if (!success)
return; return;
remove_trip(trippath, TRUE); remove_trip(trippath);
mark_divelist_changed(TRUE); mark_divelist_changed(TRUE);
} }