Merge lp:~jeremywootten/pantheon-files/fix-1677467-start-with-broken-network-connection into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Use async query info even for apparently local folders, avoiding a timeout if the network is down in some situations

This branch fixes an issue where Files appears to hang (although it should time out and continue eventually) on startup if there is a remote folder mounted by fstab and the network connection is broken. Folders with an a local uri are no longer assumed to be local by GOFDirectoryAsync on initialization and the asynchronous method for obtaining info (with a shorter timeout) is used to avoid blocking under these circumstances.

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2017-02-26 04:50:36 +0000
+++ libcore/gof-directory-async.vala	2017-04-03 11:54:37 +0000
@@ -210,10 +210,8 @@
             return false;
         }
 
-        if (is_local) {
-            debug ("Loading info for local directory");
-            return file.ensure_query_info ();
-        }
+        /* is_network flag fails to detect remote folders mapped to a local uri through fstab, so treat
+         * all folders as potentially remote (and disconnected) */
 
         if (!yield try_query_info ()) { /* may already be mounted */
             debug ("try query info failed - trying to mount");

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2017-02-26 04:50:36 +0000
+++ src/View/ViewContainer.vala	2017-04-03 11:54:37 +0000
@@ -213,10 +213,11 @@
             view_mode = mode;
             overlay_statusbar.showbar = view_mode != Marlin.ViewMode.LIST;
 
-            if (mode == Marlin.ViewMode.MILLER_COLUMNS)
+            if (mode == Marlin.ViewMode.MILLER_COLUMNS) {
                 this.view = new Miller (loc, this, mode);
-            else
+            } else {
                 this.view = new Slot (loc, this, mode);
+            }
 
             connect_slot_signals (this.view);
             directory_is_loading (loc);

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2017-03-07 19:24:18 +0000
+++ src/View/Window.vala	2017-04-03 11:54:37 +0000
@@ -883,10 +883,11 @@
 
         public uint restore_tabs () {
             /* Do not restore tabs more than once */
-            if (tabs_restored || !is_first_window)
+            if (tabs_restored || !is_first_window) {
                 return 0;
-            else
+            } else {
                 tabs_restored = true;
+            }
 
             GLib.Variant tab_info_array = Preferences.settings.get_value ("tab-info-list");
             GLib.VariantIter iter = new GLib.VariantIter (tab_info_array);
@@ -920,8 +921,9 @@
 
                 add_tab (root_location, mode);
 
-                if (mode == Marlin.ViewMode.MILLER_COLUMNS && tip_uri != root_uri)
+                if (mode == Marlin.ViewMode.MILLER_COLUMNS && tip_uri != root_uri) {
                     expand_miller_view (tip_uri, root_location);
+                }
 
                 tabs_added++;
                 mode = Marlin.ViewMode.INVALID;
@@ -952,8 +954,9 @@
             if (current_tab != null) {
                 path = current_tab.get_tip_uri ();
 
-                if (path == null || path == "")
+                if (path == null || path == "") {
                     path = current_tab.get_root_uri ();
+                }
             }
 
             /* Render the final path in the location bar without animation */