Merge lp://staging/~jeremywootten/pantheon-files/fix-context-menu-when-admin into lp://staging/~elementary-apps/pantheon-files/trunk

Proposed by Jeremy Wootten
Status: Merged
Approved by: Danielle Foré
Approved revision: 2211
Merged at revision: 2579
Proposed branch: lp://staging/~jeremywootten/pantheon-files/fix-context-menu-when-admin
Merge into: lp://staging/~elementary-apps/pantheon-files/trunk
Diff against target: 233 lines (+56/-39)
5 files modified
libcore/PluginManager.vala (+15/-12)
libwidgets/Chrome/BreadcrumbIconList.vala (+7/-7)
src/Application.vala (+1/-1)
src/View/AbstractDirectoryView.vala (+26/-18)
src/View/Sidebar.vala (+7/-1)
To merge this branch: bzr merge lp://staging/~jeremywootten/pantheon-files/fix-context-menu-when-admin
Reviewer Review Type Date Requested Status
Adam Bieńkowski (community) code Approve
Review via email: mp+312415@code.staging.launchpad.net

Commit message

Do not show certain unusable options when running as admin and cures some terminal warnings

Description of the change

This branch does not show certain unusable options when running as admin and cures some terminal warnings.

TO TEST:
After installing and killing existing Files processes, run "New Window as Administrator" from plank or "pantheon-files-pkexec" from the command line. Compared to trunk there are fewer context menu options, the trash and network are unavailable and there are fewer terminal warnings.

To post a comment you must log in.
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Whether or not the program is run with pkexec or (gk)sudo, the network options in the sidebar do not work in trunk and are suppressed in this branch.

Revision history for this message
Adam Bieńkowski (donadigo) wrote :

Two comments. I can confirm that there are less warnings in the output and that there are no network options.

review: Needs Fixing (code / testing)
2209. By Jeremy Wootten

Merge trunk to r2571

2210. By Jeremy Wootten

Merge trunk to r2572 and resolve conflicts

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Fixed conflicts with trunk r2572.

2211. By Jeremy Wootten

Fix indentation in PluginManager

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Fixed indentation fault in PluginManager.

The comment "/* Add Entire Network BUILTIN */" is reproduced in the replacement code.

Revision history for this message
Adam Bieńkowski (donadigo) wrote :

Code looks good to me now. Thanks.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: