Fix memory leak on re-downloading 'bad' map image tiles.

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

diff --git a/src/datasource_geojson.c b/src/datasource_geojson.c
index ec9fd78a1851a435eae6bfb983aafa3358ff304e..93356485b12639f8744187bbf064e320111abe76 100644 (file)
--- a/src/datasource_geojson.c
+++ b/src/datasource_geojson.c
@@ -2,7 +2,7 @@
 /*
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
- * Copyright (C) 2014, Rob Norris <rw_norris@hotmail.com>
+ * Copyright (C) 2014-2015, Rob Norris <rw_norris@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,8 +38,8 @@ static gchar *last_folder_uri = NULL;
 
 static gpointer datasource_geojson_init ( acq_vik_t *avt );
 static void datasource_geojson_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data );
-static void datasource_geojson_get_cmd_string ( datasource_geojson_user_data_t *ud, gchar **cmd, gchar **input_file_type, DownloadMapOptions *options );
-static gboolean datasource_geojson_process ( VikTrwLayer *vtl, const gchar *cmd, const gchar *extra, BabelStatusFunc status_cb, acq_dialog_widgets_t *adw, gpointer not_used );
+static void datasource_geojson_get_process_options ( datasource_geojson_user_data_t *user_data, ProcessOptions *po, gpointer not_used, const gchar *not_used2, const gchar *not_used3 );
+static gboolean datasource_geojson_process ( VikTrwLayer *vtl, ProcessOptions *process_options, BabelStatusFunc status_cb, acq_dialog_widgets_t *adw, DownloadFileOptions *options_unused );
 static void datasource_geojson_cleanup ( gpointer data );
 
 VikDataSourceInterface vik_datasource_geojson_interface = {
@@ -53,7 +53,7 @@ VikDataSourceInterface vik_datasource_geojson_interface = {
        (VikDataSourceInitFunc)               datasource_geojson_init,
        (VikDataSourceCheckExistenceFunc)     NULL,
        (VikDataSourceAddSetupWidgetsFunc)    datasource_geojson_add_setup_widgets,
-       (VikDataSourceGetCmdStringFunc)       datasource_geojson_get_cmd_string,
+       (VikDataSourceGetProcessOptionsFunc)  datasource_geojson_get_process_options,
        (VikDataSourceProcessFunc)            datasource_geojson_process,
        (VikDataSourceProgressFunc)           NULL,
        (VikDataSourceAddProgressWidgetsFunc) NULL,
@@ -112,7 +112,7 @@ static void datasource_geojson_add_setup_widgets ( GtkWidget *dialog, VikViewpor
        gtk_widget_show_all ( dialog );
 }
 
-static void datasource_geojson_get_cmd_string ( datasource_geojson_user_data_t *userdata, gchar **cmd, gchar **input_file_type, DownloadMapOptions *options )
+static void datasource_geojson_get_process_options ( datasource_geojson_user_data_t *userdata, ProcessOptions *po, gpointer not_used, const gchar *not_used2, const gchar *not_used3 )
 {
        // Retrieve the files selected
        userdata->filelist = gtk_file_chooser_get_filenames ( GTK_FILE_CHOOSER(userdata->files) ); // Not reusable !!
@@ -120,19 +120,18 @@ static void datasource_geojson_get_cmd_string ( datasource_geojson_user_data_t *
        // Memorize the directory for later reuse
        g_free ( last_folder_uri );
        last_folder_uri = gtk_file_chooser_get_current_folder_uri ( GTK_FILE_CHOOSER(userdata->files) );
-       last_folder_uri = g_strdup ( last_folder_uri );
 
        // TODO Memorize the file filter for later reuse?
        //GtkFileFilter *filter = gtk_file_chooser_get_filter ( GTK_FILE_CHOOSER(userdata->files) );
 
        // return some value so *thread* processing will continue
-       *cmd = g_strdup ("fake command"); // Not really used, thus no translations
+       po->babelargs = g_strdup ("fake command"); // Not really used, thus no translations
 }
 
 /**
  * Process selected files and try to generate waypoints storing them in the given vtl
  */
-static gboolean datasource_geojson_process ( VikTrwLayer *vtl, const gchar *cmd, const gchar *extra, BabelStatusFunc status_cb, acq_dialog_widgets_t *adw, gpointer not_used )
+static gboolean datasource_geojson_process ( VikTrwLayer *vtl, ProcessOptions *process_options, BabelStatusFunc status_cb, acq_dialog_widgets_t *adw, DownloadFileOptions *options_unused )
 {
        datasource_geojson_user_data_t *user_data = (datasource_geojson_user_data_t *)adw->user_data;
 
@@ -146,7 +145,7 @@ static gboolean datasource_geojson_process ( VikTrwLayer *vtl, const gchar *cmd,
                        // Important that this process is run in the main thread
                        vik_window_open_file ( adw->vw, gpx_filename, FALSE );
                        // Delete the temporary file
-                       g_remove (gpx_filename);
+                       (void)g_remove (gpx_filename);
                        g_free (gpx_filename);
                }
                else {