Merge lp:~jeremywootten/pantheon-files/fix-1515061-filechooser-respect-set-filter into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Initialize active file filter entry correctly.

This branch fixes the Pantheon FileChooser module so that the filter combobox is correctly initialised to the default filter passed in by the calling app rather than being hard-coded to start with entry 0 active.

Install the branch in order for the fixed module to be used e.g. by Scratch or Audience.
Scratch should now default to Text files and Audience to Video files when choosing a file to open.

[Adam Bieńkowski (donadigo)]

I can confirm that this fixes the issue. Thanks for taking care of the module!

review: Approve (code / tests)

=== modified file 'filechooser-module/FileChooserDialog.vala'
--- filechooser-module/FileChooserDialog.vala	2015-10-08 17:17:20 +0000
+++ filechooser-module/FileChooserDialog.vala	2016-04-07 11:36:04 +0000
@@ -239,7 +239,9 @@
     }
     
     private static void setup_filter_box () {
-        var filters = chooser.list_filters (); 
+        var filters = chooser.list_filters ();
+        var current_filter_name = chooser.get_filter ().get_filter_name ();
+
         if (filters.length () > 0) {
             filters_available = true;
             var combo_box = new Gtk.ComboBoxText ();
@@ -256,12 +258,16 @@
                 });
             });
 
+            var index = 0;
             filters.foreach ((filter) => {
-                combo_box.append_text (filter.get_filter_name ()); 
+                var name = filter.get_filter_name ();
+                combo_box.append_text (name);
+                if (name == current_filter_name) {
+                    combo_box.active = index;
+                }
+                index++;
             });
 
-            combo_box.active = 0;
-       
             var grid = new Gtk.Grid ();
             grid.margin_start = 5;
             grid.add (combo_box);