gtk_object_sink has been deprecated since gtk version 2.10, use g_object_ref_sink...

[andy/viking.git] / src / file.c

diff --git a/src/file.c b/src/file.c
index 8f410db3fa1151a7a0de841c456cd786ee21a1a7..408e6cb1db1508a17e0aa60792abd91f5d318761 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -188,6 +188,7 @@ static void file_write ( VikAggregateLayer *top, FILE *f, gpointer vp )
     case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
     case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;
     case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
+    case VIK_VIEWPORT_DRAWMODE_LATLON: modestring = "latlon"; break;
     default:
       g_critical("Houston, we've had a problem. mode=%d", mode);
   }
@@ -431,6 +432,8 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
       }
       else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "mercator" ) == 0)
         vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_MERCATOR );
+      else if ( stack->under == NULL && eq_pos == 4 && strncasecmp ( line, "mode", eq_pos ) == 0 && strcasecmp ( line+5, "latlon" ) == 0)
+        vik_viewport_set_drawmode ( VIK_VIEWPORT(vp), VIK_VIEWPORT_DRAWMODE_LATLON );
       else if ( stack->under == NULL && eq_pos == 5 && strncasecmp ( line, "color", eq_pos ) == 0 )
         vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );
       else if ( stack->under == NULL && eq_pos == 9 && strncasecmp ( line, "drawscale", eq_pos ) == 0 )
@@ -574,7 +577,6 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen
   }
   else
   {
-    VikCoord new_center;
     VikLayer *vtl = vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE );
     vik_layer_rename ( vtl, a_file_basename ( filename ) );
 
@@ -587,8 +589,8 @@ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filen
 
     vik_aggregate_layer_add_layer ( top, vtl );
 
-    if ( vik_trw_layer_find_center ( VIK_TRW_LAYER(vtl), &new_center ) )
-      vik_viewport_set_center_coord ( VIK_VIEWPORT(vp), &new_center );
+    vik_trw_layer_auto_set_view ( VIK_TRW_LAYER(vtl), vp );
+
     xfclose(f);
     return 2;
   }
@@ -644,7 +646,7 @@ gboolean check_file_ext ( const gchar *filename, const gchar *fileext )
   return FALSE;
 }
 
-gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type, const gchar *trackname )
+gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname )
 {
   FILE *f = g_fopen ( filename, "w" );
   if ( f )