X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=4ac8e3e99dc14dd8140586f0ff07e9e892c50e7f;hb=1efcf4538b8a034e8b288d5b9c375ba99b1d845f;hp=dbe1f0f137be5f769608c5e4d21dfe58dd917c59;hpb=ede70c03b0cff83f1d740204127fe594b8c378ec;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index dbe1f0f..4ac8e3e 100644 --- a/equipment.c +++ b/equipment.c @@ -3,7 +3,6 @@ * controlled through the following interfaces: * * void show_dive_equipment(struct dive *dive) - * void flush_dive_equipment_changes(struct dive *dive) * * called from gtk-ui: * GtkWidget *equipment_widget(void) @@ -419,8 +418,9 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->pressure_button))) { start = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->start)); end = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->end)); - } else + } else { start = end = 0; + } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button))) o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5; else @@ -428,11 +428,6 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2); } -void flush_dive_equipment_changes(struct dive *dive) -{ - /* We do nothing: we require the "Ok" button press */ -} - /* * We hardcode the most common standard cylinders, * we should pick up any other names from the dive @@ -852,6 +847,7 @@ static GtkWidget *cylinder_list_create(void) ); cylinder_list.model = model; tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); + gtk_widget_set_can_focus(tree_view, FALSE); g_signal_connect(tree_view, "row-activated", G_CALLBACK(row_activated_cb), model); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));