X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/313490094e04a31b987bb0e39df2db7a7e90e8a1..9979924fa3b7982b47b57555215e258dcc4d51c1:/src/datasource_file.c?ds=inline

diff --git a/src/datasource_file.c b/src/datasource_file.c
index a40f04a6..c96b4cc1 100644
--- a/src/datasource_file.c
+++ b/src/datasource_file.c
@@ -52,21 +52,22 @@ static int last_type = 0;
 
 static gpointer datasource_file_init( );
 static void datasource_file_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data );
-static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets, gchar **cmd, gchar **input_file_type );	
+static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets, gchar **cmd, gchar **input_file_type, gpointer not_used );
 static void datasource_file_cleanup ( gpointer data );
 
 VikDataSourceInterface vik_datasource_file_interface = {
   N_("Import file with GPSBabel"),
   N_("Imported file"),
-  VIK_DATASOURCE_GPSBABEL_DIRECT,
   VIK_DATASOURCE_ADDTOLAYER,
   VIK_DATASOURCE_INPUTTYPE_NONE,
   TRUE,
   TRUE,
+  TRUE,
   (VikDataSourceInitFunc)		datasource_file_init,
   (VikDataSourceCheckExistenceFunc)	NULL,
   (VikDataSourceAddSetupWidgetsFunc)	datasource_file_add_setup_widgets,
   (VikDataSourceGetCmdStringFunc)	datasource_file_get_cmd_string,
+  (VikDataSourceProcessFunc)        a_babel_convert_from,
   (VikDataSourceProgressFunc)		NULL,
   (VikDataSourceAddProgressWidgetsFunc)	NULL,
   (VikDataSourceCleanupFunc)		datasource_file_cleanup,
@@ -82,11 +83,12 @@ static gpointer datasource_file_init ( )
 
 static void fill_combo_box (gpointer data, gpointer user_data)
 {
-  GtkComboBoxText *combo = GTK_COMBO_BOX_TEXT (user_data);
   const gchar *label = ((BabelFile*) data)->label;
 #if GTK_CHECK_VERSION (2,24,0)
+  GtkComboBoxText *combo = GTK_COMBO_BOX_TEXT (user_data);
   gtk_combo_box_text_append_text (combo, label);
 #else
+  GtkComboBox *combo = GTK_COMBO_BOX (user_data);
   gtk_combo_box_append_text (combo, label);
 #endif
 }
@@ -161,12 +163,10 @@ static void datasource_file_add_setup_widgets ( GtkWidget *dialog, VikViewport *
 }
 
 /* See VikDataSourceInterface */
-static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets, gchar **cmd, gchar **input_file )
+static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets, gchar **cmd, gchar **input_file, gpointer not_used )
 {
-  gchar *filename, *type;
-
   /* Retrieve the file selected */
-  filename = gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER(widgets->file) );
+  gchar *filename = gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER(widgets->file) );
 
   /* Memorize the directory for later use */
   g_free (last_folder_uri);
@@ -178,8 +178,10 @@ static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets,
   last_file_filter = g_object_get_data ( G_OBJECT(filter), "Babel" );
 
   /* Retrieve and memorize file format selected */
+  gchar *type = NULL;
   last_type = gtk_combo_box_get_active ( GTK_COMBO_BOX (widgets->type) );
-  type = ((BabelFile*)g_list_nth_data (a_babel_file_list, last_type))->name;
+  if ( a_babel_file_list )
+    type = ((BabelFile*)g_list_nth_data (a_babel_file_list, last_type))->name;
 
   /* Build the string */
   *cmd = g_strdup_printf( "-i %s", type);