gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/8fc901fb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5afdea05 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ddaf8cd6 (commit)
	from  https://github.com/Gnucash/gnucash/commit/2bbf5b2c (commit)



commit 8fc901fb3bbac07aa26a94d15f2173dc0d914ef0
Merge: 2bbf5b2ce 5afdea057
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Mar 22 13:25:08 2020 -0700

    Merge Jean Laroche's 'import-ofx-only' into maint.


commit 5afdea0576a1a5ee3a6f9f54b312a6d3be2df865
Merge: 2bbf5b2ce ddaf8cd61
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Mar 22 13:17:50 2020 -0700

    Merge Jean Laroche's 'select_ofx_files_only_maint' into maint.


commit ddaf8cd614ebf382ac9172c4e28b8d3fb0f7e033
Author: jean <you at example.com>
Date:   Sun Mar 22 12:48:28 2020 -0700

    When selecting a file for OFX import, restrict the files listed to .OFX (or .QFX)

diff --git a/gnucash/import-export/ofx/gnc-ofx-import.c b/gnucash/import-export/ofx/gnc-ofx-import.c
index b0f7edecf..b4c0c3e0b 100644
--- a/gnucash/import-export/ofx/gnc-ofx-import.c
+++ b/gnucash/import-export/ofx/gnc-ofx-import.c
@@ -1032,6 +1032,8 @@ void gnc_file_ofx_import (GtkWindow *parent)
     char *selected_filename;
     char *default_dir;
     LibofxContextPtr libofx_context = libofx_get_new_context();
+    GList *filters = NULL;
+    GtkFileFilter* filter = gtk_file_filter_new ();
 
     ofx_PARSER_msg = false;
     ofx_DEBUG_msg = false;
@@ -1043,9 +1045,13 @@ void gnc_file_ofx_import (GtkWindow *parent)
     DEBUG("gnc_file_ofx_import(): Begin...\n");
 
     default_dir = gnc_get_default_directory(GNC_PREFS_GROUP);
+    gtk_file_filter_set_name (filter, "ofx/qfx files (*.ofx,*.qfx)");
+    gtk_file_filter_add_pattern (filter, "*.[oqOQ][fF][xX]");
+    filters = g_list_prepend( filters, filter );
+
     selected_filename = gnc_file_dialog(parent,
                                         _("Select an OFX/QFX file to process"),
-                                        NULL,
+                                        filters,
                                         default_dir,
                                         GNC_FILE_DIALOG_IMPORT);
     g_free(default_dir);



Summary of changes:
 gnucash/import-export/ofx/gnc-ofx-import.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)