Merge lp://staging/~ralsina/ubuntuone-client/fix_712674_on_1.4 into lp://staging/ubuntuone-client/stable-1-4
| Status: | Merged |
|---|---|
| Approved by: | Roman Yepishev |
| Approved revision: | 751 |
| Merged at revision: | 748 |
| Proposed branch: | lp://staging/~ralsina/ubuntuone-client/fix_712674_on_1.4 |
| Merge into: | lp://staging/ubuntuone-client/stable-1-4 |
| Diff against target: |
86 lines (+37/-4) 1 file modified
nautilus/ubuntuone-nautilus.c (+37/-4) |
| To merge this branch: | bzr merge lp://staging/~ralsina/ubuntuone-client/fix_712674_on_1.4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roman Yepishev (community) | fieldtest | Approve | |
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Don't offer the "Publish" option in the context menu for files/folders that are being shared to the user, because it's not supported.
Description of the change
Adds a utility function to determine if a file or directory is inside a share, and uses that to modify the context menu so you can't try to publish those files/directories.
To fieldtest it, build it using these commands:
WARNING, this overwrites part of ubuntuone-
./autogen.sh
./configure --prefix=/usr
make
cd nautilus && sudo make install
pkill nautilus
nautilus nautilus ~/Ubuntu\ One/Shared\ With\ Me/
Then check the context menus, the "Ubuntu One->Publish" option should be disabled.
Check also in a subdirectory, with folders and files, and that the Publish option is enabled for contents outside the shares.
| Roberto Alsina (ralsina) wrote | # |
| dobey (dobey) | # |
54 +
55 +
56 +
57 +
85 +
86 +
87 +
What are all the extra blank lines being added for?