mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-17 22:46:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Repair broken Add Dive menu item

Browse source 
Lubomir's commit aec904b612 broke the Add
Dive menu item:  The Edit Dive dialogue didn't show up after the initial
dialogue.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2012-11-04 20:35:59 +01:00 • committed by Dirk Hohndel
parent 45fce18fb2
commit 37e3ade2e2
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dive.h
View file

@ -415,7 +415,7 @@ extern void evn_foreach(void (*callback)(const char *, int *, void *), void *dat
extern int add_new_dive(struct dive *dive); extern int add_new_dive(struct dive *dive);
extern gboolean edit_trip(dive_trip_t *trip); extern gboolean edit_trip(dive_trip_t *trip);
extern int edit_dive_info(struct dive *dive); extern int edit_dive_info(struct dive *dive, gboolean newdive);
extern int edit_multi_dive_info(struct dive *single_dive); extern int edit_multi_dive_info(struct dive *single_dive);
extern void dive_list_update_dives(void); extern void dive_list_update_dives(void);
extern void flush_divelist(struct dive *dive); extern void flush_divelist(struct dive *dive);

2
divelist.c
View file

@ -1340,7 +1340,7 @@ static void row_activated_cb(GtkTreeView *tree_view,
collapse_expand(tree_view, path); collapse_expand(tree_view, path);
return; return;
} }
edit_dive_info(get_dive(index)); edit_dive_info(get_dive(index), FALSE);
} }
void add_dive_cb(GtkWidget *menuitem, gpointer data) void add_dive_cb(GtkWidget *menuitem, gpointer data)

7
info.c
View file

@ -792,10 +792,11 @@ int edit_multi_dive_info(struct dive *single_dive)
return success; return success;
} }
int edit_dive_info(struct dive *dive) int edit_dive_info(struct dive *dive, gboolean newdive)
{ {
if (!dive || !amount_selected) if (!dive || (!newdive && !amount_selected))
return 0; return 0;
return edit_multi_dive_info(dive); return edit_multi_dive_info(dive);
} }
@ -938,7 +939,7 @@ int add_new_dive(struct dive *dive)
if (!dive_time_widget(dive)) if (!dive_time_widget(dive))
return 0; return 0;
return edit_dive_info(dive); return edit_dive_info(dive, TRUE);
} }
GtkWidget *extended_dive_info_widget(void) GtkWidget *extended_dive_info_widget(void)