X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/9106934d92f6af13bfe1df8cd6886e115aafe22b..cd0b7e8541b5e65f1c0ac9c9b3115d14cc58af0a:/src/preferences.c

diff --git a/src/preferences.c b/src/preferences.c
index bcae6243..975f54d3 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -26,6 +26,7 @@
 #include "preferences.h"
 #include "dir.h"
 #include "file.h"
+#include "util.h"
 
 // TODO: STRING_LIST
 // TODO: share code in file reading
@@ -50,6 +51,7 @@ static void preferences_groups_init()
 
 static void preferences_groups_uninit()
 {
+  g_ptr_array_foreach ( groups_names, (GFunc)g_free, NULL );
   g_ptr_array_free ( groups_names, TRUE );
   g_hash_table_destroy ( groups_keys_to_indices );
 }
@@ -88,11 +90,12 @@ static gboolean preferences_load_from_file()
     while ( ! feof (f) ) {
       if (fgets(buf,sizeof(buf),f) == NULL)
         break;
-      if ( split_string_from_file_on_equals(buf, &key, &val ) ) {
+      if ( split_string_from_file_on_equals ( buf, &key, &val ) ) {
         // if it's not in there, ignore it
         oldval = g_hash_table_lookup ( values, key );
         if ( ! oldval ) {
           g_free(key);
+          g_free(val);
           continue;
         }
 
@@ -105,6 +108,7 @@ static gboolean preferences_load_from_file()
         g_hash_table_insert ( values, key, newval );
 
         g_free(key);
+        g_free(val);
         // change value
       }
     }
@@ -115,17 +119,20 @@ static gboolean preferences_load_from_file()
   return FALSE;
 }
 
-static void preferences_run_setparam ( gpointer notused, guint16 i, VikLayerParamData data, VikLayerParam *params )
+static void preferences_run_setparam ( gpointer notused, guint16 i, VikLayerParamData data, VikLayerParam *vlparams )
 {
-  if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST )
+  // Don't change stored pointer values
+  if ( vlparams[i].type == VIK_LAYER_PARAM_PTR )
+    return;
+  if ( vlparams[i].type == VIK_LAYER_PARAM_STRING_LIST )
     g_critical ( "Param strings not implemented in preferences"); //fake it
-  g_hash_table_insert ( values, (gchar *)(params[i].name), vik_layer_typed_param_data_copy_from_data(params[i].type, data) );
+  g_hash_table_insert ( values, (gchar *)(vlparams[i].name), vik_layer_typed_param_data_copy_from_data(vlparams[i].type, data) );
 }
 
 /* Allow preferences to be manipulated externally */
-void a_preferences_run_setparam ( VikLayerParamData data, VikLayerParam *params )
+void a_preferences_run_setparam ( VikLayerParamData data, VikLayerParam *vlparams )
 {
-  preferences_run_setparam (NULL, 0, data, params);
+  preferences_run_setparam (NULL, 0, data, vlparams);
 }
 
 static VikLayerParamData preferences_run_getparam ( gpointer notused, guint16 i, gboolean notused2 )
@@ -137,7 +144,11 @@ static VikLayerParamData preferences_run_getparam ( gpointer notused, guint16 i,
   return val->data;
 }
 
-/* TRUE on success */
+/**
+ * a_preferences_save_to_file:
+ * 
+ * Returns: TRUE on success
+ */
 gboolean a_preferences_save_to_file()
 {
   gchar *fn = g_build_filename(a_get_viking_dir(), VIKING_PREFS_FILE, NULL);
@@ -157,8 +168,9 @@ gboolean a_preferences_save_to_file()
     for ( i = 0; i < params->len; i++ ) {
       param = (VikLayerParam *) g_ptr_array_index(params,i);
       val = (VikLayerTypedParamData *) g_hash_table_lookup ( values, param->name );
-      g_assert ( val != NULL );
-      file_write_layer_param ( f, param->name, val->type, val->data );
+      if ( val )
+        if ( val->type != VIK_LAYER_PARAM_PTR )
+          file_write_layer_param ( f, param->name, val->type, val->data );
     }
     fclose(f);
     f = NULL;
@@ -184,7 +196,7 @@ void a_preferences_show_window(GtkWindow *parent) {
 				(gchar **) groups_names->pdata, groups_names->len, // groups, groups_count, // groups? what groups?!
 				(gboolean (*) (gpointer,guint16,VikLayerParamData,gpointer,gboolean)) preferences_run_setparam,
 				NULL /* not used */, contiguous_params,
-                                preferences_run_getparam, NULL /* not used */ ) ) {
+                                preferences_run_getparam, NULL, NULL /* not used */ ) ) {
       a_preferences_save_to_file();
     }
     g_free ( contiguous_params );
@@ -192,6 +204,9 @@ void a_preferences_show_window(GtkWindow *parent) {
 
 void a_preferences_register(VikLayerParam *pref, VikLayerParamData defaultval, const gchar *group_key )
 {
+  // All preferences should be registered before loading
+  if ( loaded )
+    g_critical ( "REGISTERING preference %s after LOADING from " VIKING_PREFS_FILE, pref->name );
   /* copy value */
   VikLayerParam *newpref = g_new(VikLayerParam,1);
   *newpref = *pref;
@@ -220,6 +235,7 @@ void a_preferences_uninit()
 {
   preferences_groups_uninit();
 
+  g_ptr_array_foreach ( params, (GFunc)g_free, NULL );
   g_ptr_array_free ( params, TRUE );
   g_hash_table_destroy ( values );
 }
@@ -229,6 +245,7 @@ void a_preferences_uninit()
 VikLayerParamData *a_preferences_get(const gchar *key)
 {
   if ( ! loaded ) {
+    g_debug ( "%s: First time: %s\n", __FUNCTION__, key );
     /* since we can't load the file in a_preferences_init (no params registered yet),
      * do it once before we get the first key. */
     preferences_load_from_file();