Merge lp:~donadigo/pantheon-files/fix-get-filter-name into lp:~elementary-apps/pantheon-files/trunk

[Adam Bieńkowski]

* Fix gtk_file_filter_get_name warnings

Fixes "[Gtk] gtk_file_filter_get_name: assertion 'GTK_IS_FILE_FILTER (filter)' failed" warnings..

There's a missing check if get_filter actually returns non-null value, we check that now.

[Danielle Foré (danrabbit)]

Go fish

review: Needs Fixing

[Danielle Foré (danrabbit)]

Looks like something else was actually causing the Chrome issue, but this is still a good fix. I withdraw my review ;)

review: Abstain

[Jeremy Wootten (jeremywootten)]

See inline comment. This branch does need to be merged tho'

review: Needs Fixing (code)

[lp:~donadigo/pantheon-files/fix-get-filter-name]

2576. By Adam Bieńkowski on 2017-06-10

Change variable name

2577. By Adam Bieńkowski on 2017-06-10

Remove unintended changes

2578. By Adam Bieńkowski on 2017-06-10

Remove more unneded changes

2579. By Adam Bieńkowski on 2017-06-10

Resolve conflicts

[Adam Bieńkowski (donadigo)]

jeremywootten: I've changed the variable name to "current_filter". Ready to review again.

[Jeremy Wootten (jeremywootten)]

Looks good now - thanks!

review: Approve

=== modified file 'filechooser-module/FileChooserDialog.vala'
--- filechooser-module/FileChooserDialog.vala	2017-06-07 17:33:33 +0000
+++ filechooser-module/FileChooserDialog.vala	2017-06-10 22:47:21 +0000
@@ -289,9 +289,14 @@
 
     private void setup_filter_box () {
         var filters = chooser_dialog.list_filters ();
-        var current_filter_name = chooser_dialog.get_filter ().get_filter_name ();
 
         if (filters.length () > 0) {
+            string? current_filter_name = null;
+            var current_filter = chooser_dialog.get_filter ();
+            if (current_filter != null) {
+                current_filter_name = current_filter.get_filter_name ();
+            }
+
             filters_available = true;
             var combo_box = new Gtk.ComboBoxText ();
             combo_box.changed.connect (() => {