Merge lp:~donadigo/pantheon-files/fix-treeview-detection into lp:~elementary-apps/pantheon-files/trunk

[Adam Bieńkowski]

- FileChooser Module: fix Treeview detection

This branch fixes that the code assumes that there is only one widget per container, but in reality there can be more, it fails because the next widget does not need to be a container.

It also does add a guard against null TreeView in case something's gone wrong with detecting the widget.

[Felipe Escoto (philip.scott)]

Fixes the crashes it was giving

review: Approve

=== modified file 'filechooser-module/FileChooserDialog.vala'
--- filechooser-module/FileChooserDialog.vala	2016-07-25 17:50:23 +0000
+++ filechooser-module/FileChooserDialog.vala	2016-07-30 20:14:58 +0000
@@ -35,6 +35,7 @@
     /* Paths to widgets */
     private const string[] GTK_PATHBAR_PATH = { "widget", "browse_widgets_box", "browse_files_box", "browse_header_revealer" };
     private const string[] GTK_FILTERCHOOSER_PATH = { "extra_and_filters", "filter_combo_hbox" };
+    private const string[] GTK_TREEVIEW_PATH = { "browse_files_stack", "browse_files_swin", "browse_files_tree_view" };
     private const string PLACES_SIDEBAR_PATH = "places_sidebar";
 
     private GLib.Queue<string> previous_paths;
@@ -231,7 +232,9 @@
                 (w2 as Gtk.Container).remove (w3);
             } else if (w3.get_name () ==  "list_and_preview_box") { /* file browser list and preview box */
                 var tv = find_tree_view (w3);
-                tv.set_activate_on_single_click (is_single_click);
+                if (tv != null) {
+                    tv.set_activate_on_single_click (is_single_click);
+                }
             }
         });
     }
@@ -240,16 +243,23 @@
         /* Locate the TreeView and set its click behaviour */
         Gtk.TreeView? tv = null;
         ((Gtk.Container)browser_box).get_children ().foreach ((w) => {
-            ((Gtk.Container)w).get_children ().foreach ((w) => {
+            if (w.get_name () == GTK_TREEVIEW_PATH[0]) {
                 ((Gtk.Container)w).get_children ().foreach ((w) => {
-                    ((Gtk.Container)w).get_children ().foreach ((w) => {
-                        if (w is Gtk.TreeView) {
-                            tv =(Gtk.TreeView)w;
-                        }
-                    });
+                    if (w.name == "GtkBox") {
+                        ((Gtk.Container)w).get_children ().foreach ((w) => {
+                            if (w.get_name () == GTK_TREEVIEW_PATH[1]) {
+                                ((Gtk.Container)w).get_children ().foreach ((w) => {
+                                    if (w.get_name () == GTK_TREEVIEW_PATH[2]) {
+                                        tv = (Gtk.TreeView)w;
+                                    }
+                                });
+                            }
+                        });
+                    }
                 });
-            });
+            }
         });
+
         return tv;
     }