Merge branch 'Geotagging'

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

diff --git a/src/file.c b/src/file.c
index b7a98b2bbc4187a314fd0dd1be9f8cd24c5dc076..3fb200b36e7d6bb960b9a29db88af079e8bd8943 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -603,7 +603,7 @@ VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar
     // In fact both kml & gpx files start the same as they are in xml
     if ( check_file_ext ( filename, ".kml" ) && check_magic ( f, GPX_MAGIC ) ) {
       // Implicit Conversion
-      if ( ! a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", NULL, filename, NULL ) ) {
+      if ( ! a_babel_convert_from ( VIK_TRW_LAYER(vtl), "-i kml", filename, NULL, NULL ) ) {
        // Probably want to remove the vtl, but I'm not sure how yet...
        xfclose(f);
        return LOAD_TYPE_GPSBABEL_FAILURE;
@@ -713,14 +713,14 @@ gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t
          f = NULL;
          switch ( a_vik_get_kml_export_units () ) {
            case VIK_KML_EXPORT_UNITS_STATUTE:
-             return a_babel_convert_to ( vtl, "-o kml", NULL, filename, NULL );
+             return a_babel_convert_to ( vtl, "-o kml", filename, NULL, NULL );
              break;
            case VIK_KML_EXPORT_UNITS_NAUTICAL:
-             return a_babel_convert_to ( vtl, "-o kml,units=n", NULL, filename, NULL );
+             return a_babel_convert_to ( vtl, "-o kml,units=n", filename, NULL, NULL );
              break;
            default:
              // VIK_KML_EXPORT_UNITS_METRIC:
-             return a_babel_convert_to ( vtl, "-o kml,units=m", NULL, filename, NULL );
+             return a_babel_convert_to ( vtl, "-o kml,units=m", filename, NULL, NULL );
              break;
          }
          break;