Merge lp://qastaging/~andreagrandi/unity-2d/trash-nautilus-setting-oneiric into lp://qastaging/unity-2d
Proposed by
Andrea Grandi
Status: | Merged |
---|---|
Approved by: | Alberto Mardegan |
Approved revision: | 697 |
Merged at revision: | 700 |
Proposed branch: | lp://qastaging/~andreagrandi/unity-2d/trash-nautilus-setting-oneiric |
Merge into: | lp://qastaging/unity-2d |
Diff against target: |
106 lines (+6/-52) 2 files modified
libunity-2d-private/src/trash.cpp (+4/-51) libunity-2d-private/src/trash.h (+2/-1) |
To merge this branch: | bzr merge lp://qastaging/~andreagrandi/unity-2d/trash-nautilus-setting-oneiric |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alberto Mardegan (community) | Approve | ||
Florian Boucault | Pending | ||
Review via email:
|
Description of the change
Emptying the trash by right-clicking the trash icon in the unity sidebar and selecting the "Empty ..." option requires users to confirm the action, even if they have unchecked the "Ask before emptying ..." option in nautilus > Edit > Preferences > Behaviour. The option is correctly applied to emptying the trash from nautilus itself.
Now this behaviour is respected in Unity-2D too.
To post a comment you must log in.
Great to see code getting removed, thanks :-)
A couple of comments:
- remember to delete the interface you create
- split long lines (the one where you create the interface) at 80 chars