case VIK_LAYER_WIDGET_FILEENTRY:
if ( param->type == VIK_LAYER_PARAM_STRING )
{
- rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, GPOINTER_TO_INT(param->widget_data));
+ rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, GPOINTER_TO_INT(param->widget_data), NULL, NULL);
if ( vlpd.s )
vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), vlpd.s );
}
case VIK_LAYER_WIDGET_FOLDERENTRY:
if ( param->type == VIK_LAYER_PARAM_STRING )
{
- rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, VF_FILTER_NONE);
+ rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, VF_FILTER_NONE, NULL, NULL);
if ( vlpd.s )
vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), vlpd.s );
}
}
}
- gtk_widget_destroy ( dialog ); /* hide before redrawing. */
g_free ( widgets );
g_free ( labels );
g_free ( change_values );
if ( tables )
g_free ( tables );
+ gtk_widget_destroy ( dialog ); /* hide before redrawing. */
return must_redraw ? 2 : 3; /* user clicked OK */
}
+ g_free ( widgets );
+ g_free ( labels );
+ g_free ( change_values );
if ( tables )
g_free ( tables );
gtk_widget_destroy ( dialog );
- g_free ( widgets );
+
return 0;
}
}