summaryrefslogtreecommitdiffstats
path: root/info.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-09 17:10:17 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-09 17:10:17 -0700
commit067506038a5fea72e60680513d768f89722671fd (patch)
tree9f926ebb0793cd7d4ee8445577a1d31dea901c33 /info.c
parent41bce9e5f4c80803132563681d492e74853aa609 (diff)
downloadsubsurface-067506038a5fea72e60680513d768f89722671fd.tar.gz
Rename 'cylinder.c' as 'equipment.c'
Make it about general equipment management, and start hooking up functions to show new equipment information when changing dives (and to flush changes to equipment information for the previously active dive). Nothing is hooked up yet, and it's now showing just one (really big) cylinder choice, so this is all broken. But it should make it possible to at least get somewhere some day. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'info.c')
-rw-r--r--info.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/info.c b/info.c
index b789d9fd8..9cb048b80 100644
--- a/info.c
+++ b/info.c
@@ -11,7 +11,6 @@ static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locatio
static GtkEntry *location;
static GtkTextBuffer *notes;
static int location_changed = 1, notes_changed = 1;
-static struct dive *buffered_dive;
static const char *weekday(int wday)
{
@@ -31,10 +30,8 @@ static char *get_text(GtkTextBuffer *buffer)
return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
}
-void flush_dive_info_changes(void)
+void flush_dive_info_changes(struct dive *dive)
{
- struct dive *dive = buffered_dive;
-
if (!dive)
return;
@@ -49,15 +46,12 @@ void flush_dive_info_changes(void)
}
}
-void update_dive_info(struct dive *dive)
+void show_dive_info(struct dive *dive)
{
struct tm *tm;
char buffer[80];
char *text;
- flush_dive_info_changes();
- buffered_dive = dive;
-
if (!dive) {
gtk_label_set_text(GTK_LABEL(divedate), "no dive");
gtk_label_set_text(GTK_LABEL(divetime), "");
@@ -217,6 +211,6 @@ GtkWidget *extended_dive_info_widget(void)
notes = text_view(vbox, "Notes", TRUE);
/* Add extended info here: name, description, yadda yadda */
- update_dive_info(current_dive);
+ show_dive_info(current_dive);
return vbox;
}