Files

Merge lp:~niclasl/pantheon-files/permission-denied into lp:~elementary-apps/pantheon-files/trunk

  1. permission-denied
  2. Merge into trunk
Proposed by Niclas Lockner
Status: Merged
Approved by: Cody Garver
Approved revision: 1487
Merged at revision: 1488
Proposed branch: lp:~niclasl/pantheon-files/permission-denied
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/View/ViewContainer.vala (+1/-1)
To merge this branch: bzr merge lp:~niclasl/pantheon-files/permission-denied
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+216561@code.launchpad.net

Commit message

Use the existing permission_denied in gof-directory-async instead of FileAttribute.ACCESS_CAN_READ when determining if a directory can be read or not. Fixes bug #1310903

Description of the change

Use the existing permission_denied in gof-directory-async instead of FileAttribute.ACCESS_CAN_READ when determining if a directory can be read or not.

With FileAttribute.ACCESS_CAN_READ, clicking the Network->Entire Network gives a permission denied error

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
1=== modified file 'src/View/ViewContainer.vala'
2--- src/View/ViewContainer.vala 2014-04-19 15:40:27 +0000
3+++ src/View/ViewContainer.vala 2014-04-20 22:35:27 +0000
4@@ -173,7 +173,7 @@
5 file_info = slot.location.query_info ("standard::*,access::*", FileQueryInfoFlags.NONE);
6
7 /* If not readable, alert the user */
8- if (!file_info.get_attribute_boolean (FileAttribute.ACCESS_CAN_READ)) {
9+ if (slot.directory.permission_denied) {
10 content = new Granite.Widgets.Welcome (_("This does not belong to you."),
11 _("You don't have permission to view this folder."));
12 }

Subscribers

People subscribed via source and target branches

to all changes: