X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/dc2c040e183a7ea9bcc704921dc124557f5eb21a..7233fcb656b321f5690667077d4c629300fd6ddd:/src/viklayer.c

diff --git a/src/viklayer.c b/src/viklayer.c
index a8139b5e..522be1f8 100644
--- a/src/viklayer.c
+++ b/src/viklayer.c
@@ -259,7 +259,8 @@ void vik_layer_marshall_params ( VikLayer *vl, guint8 **data, gint *datalen )
     guint16 i, params_count = vik_layer_get_interface(vl->type)->params_count;
     for ( i = 0; i < params_count; i++ )
     {
-      d = get_param(vl, i);
+      g_debug("%s: %s", __FUNCTION__, params[i].name);
+      d = get_param(vl, i, FALSE);
       switch ( params[i].type )
       {
       case VIK_LAYER_PARAM_STRING: 
@@ -323,6 +324,7 @@ void vik_layer_unmarshall_params ( VikLayer *vl, guint8 *data, gint datalen, Vik
     guint16 i, params_count = vik_layer_get_interface(vl->type)->params_count;
     for ( i = 0; i < params_count; i++ )
     {
+      g_debug("%s: %s", __FUNCTION__, params[i].name);
       switch ( params[i].type )
       {
       case VIK_LAYER_PARAM_STRING: 
@@ -330,7 +332,7 @@ void vik_layer_unmarshall_params ( VikLayer *vl, guint8 *data, gint datalen, Vik
 	s[vlm_size]=0;
 	vlm_read(s);
 	d.s = s;
-	set_param(vl, i, d, vvp);
+	set_param(vl, i, d, vvp, FALSE);
 	g_free(s);
 	break;
       case VIK_LAYER_PARAM_STRING_LIST:  {
@@ -346,14 +348,14 @@ void vik_layer_unmarshall_params ( VikLayer *vl, guint8 *data, gint datalen, Vik
           list = g_list_append ( list, s );
         }
         d.sl = list;
-        set_param ( vl, i, d, vvp );
+        set_param(vl, i, d, vvp, FALSE);
         /* don't free -- string list is responsibility of the layer */
 
         break;
         }
       default:
 	vlm_read(&d);
-	set_param(vl, i, d, vvp);
+	set_param(vl, i, d, vvp, FALSE);
 	break;
       }
     }
@@ -443,10 +445,10 @@ GdkPixbuf *vik_layer_load_icon ( gint type )
   return NULL;
 }
 
-gboolean vik_layer_set_param ( VikLayer *layer, guint16 id, VikLayerParamData data, gpointer vp )
+gboolean vik_layer_set_param ( VikLayer *layer, guint16 id, VikLayerParamData data, gpointer vp, gboolean is_file_operation )
 {
   if ( vik_layer_interfaces[layer->type]->set_param )
-    return vik_layer_interfaces[layer->type]->set_param ( layer, id, data, vp );
+    return vik_layer_interfaces[layer->type]->set_param ( layer, id, data, vp, is_file_operation );
   return FALSE;
 }
 
@@ -458,7 +460,8 @@ void vik_layer_post_read ( VikLayer *layer, VikViewport *vp, gboolean from_file
 
 static gboolean layer_properties_factory ( VikLayer *vl, VikViewport *vp )
 {
-  switch ( a_uibuilder_properties_factory ( VIK_GTK_WINDOW_FROM_WIDGET(vp),
+  switch ( a_uibuilder_properties_factory ( _("Layer Properties"),
+					    VIK_GTK_WINDOW_FROM_WIDGET(vp),
 					    vik_layer_interfaces[vl->type]->params,
 					    vik_layer_interfaces[vl->type]->params_count,
 					    vik_layer_interfaces[vl->type]->params_groups,
@@ -469,8 +472,8 @@ static gboolean layer_properties_factory ( VikLayer *vl, VikViewport *vp )
 					    (gpointer) vik_layer_interfaces[vl->type]->get_param, 
 					    vl) ) {
     case 0:
-      return FALSE;
     case 3:
+      return FALSE;
       /* redraw (?) */
     case 2:
       vik_layer_post_read ( vl, vp, FALSE ); /* update any gc's */