X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=7088a6dfacac37a824c62886ff039cba02756153;hb=86e48bfe10d271f86c896e64350c35d59c94c331;hp=4d96fa7c45e2d3f8a7ec4e6bd16b12f507f9a83e;hpb=19dd61b1268cfef1526cb4195180e19276ea81b4;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index 4d96fa7..7088a6d 100644
--- a/main.c
+++ b/main.c
@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include <time.h>
 
+#include <gconf/gconf-client.h>
+
 #include "dive.h"
 #include "divelist.h"
 #include "display.h"
@@ -14,8 +16,11 @@ GtkWidget *error_label;
 int        error_count;
 struct DiveList   dive_list;
 
+GConfClient *gconf;
 struct units output_units;
 
+#define GCONF_NAME(x) "/apps/diveclog/" #x
+
 static int sortfn(const void *_a, const void *_b)
 {
 	const struct dive *a = *(void **)_a;
@@ -295,8 +300,12 @@ static void unit_dialog(GtkWidget *w, gpointer data)
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 	if (result == GTK_RESPONSE_ACCEPT) {
 		output_units = menu_units;
+		update_dive_list_units(&dive_list);
 		repaint_dive();
-		dive_list_update_dives(dive_list);
+		gconf_client_set_bool(gconf, GCONF_NAME(feet), output_units.length == FEET, NULL);
+		gconf_client_set_bool(gconf, GCONF_NAME(psi), output_units.pressure == PSI, NULL);
+		gconf_client_set_bool(gconf, GCONF_NAME(cuft), output_units.volume == CUFT, NULL);
+		gconf_client_set_bool(gconf, GCONF_NAME(fahrenheit), output_units.temperature == FAHRENHEIT, NULL);
 	}
 	gtk_widget_destroy(dialog);
 }
@@ -358,6 +367,18 @@ int main(int argc, char **argv)
 
 	gtk_init(&argc, &argv);
 
+	g_type_init();
+	gconf = gconf_client_get_default();
+
+	if (gconf_client_get_bool(gconf, GCONF_NAME(feet), NULL))
+		output_units.length = FEET;
+	if (gconf_client_get_bool(gconf, GCONF_NAME(psi), NULL))
+		output_units.pressure = PSI;
+	if (gconf_client_get_bool(gconf, GCONF_NAME(cuft), NULL))
+		output_units.volume = CUFT;
+	if (gconf_client_get_bool(gconf, GCONF_NAME(fahrenheit), NULL))
+		output_units.temperature = FAHRENHEIT;
+
 	error_info_bar = NULL;
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);