Merge lp://qastaging/~jeremywootten/pantheon-files/fix-1677467-start-with-broken-network-connection into lp://qastaging/~elementary-apps/pantheon-files/trunk
Proposed by
Jeremy Wootten
| Status: | Merged |
|---|---|
| Approved by: | Cody Garver |
| Approved revision: | 2531 |
| Merged at revision: | 2535 |
| Proposed branch: | lp://qastaging/~jeremywootten/pantheon-files/fix-1677467-start-with-broken-network-connection |
| Merge into: | lp://qastaging/~elementary-apps/pantheon-files/trunk |
| Diff against target: |
74 lines (+12/-10) 3 files modified
libcore/gof-directory-async.vala (+2/-4) src/View/ViewContainer.vala (+3/-2) src/View/Window.vala (+7/-4) |
| To merge this branch: | bzr merge lp://qastaging/~jeremywootten/pantheon-files/fix-1677467-start-with-broken-network-connection |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| elementary Apps team | Pending | ||
|
Review via email:
|
|||
Commit message
Use async query info even for apparently local folders, avoiding a timeout if the network is down in some situations
Description of the change
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.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
