Unity

Merge lp://qastaging/~marcobiscaro2112/unity/2011-03-08 into lp://qastaging/unity

2011-03-08
Merge into trunk

Proposed by Marco Biscaro on 2011-03-08

Status:

Merged

Approved by:

Neil J. Patel on 2011-03-10

Approved revision:

no longer in the source branch.

Merged at revision:

936

Proposed branch:

lp://qastaging/~marcobiscaro2112/unity/2011-03-08

Merge into:

lp://qastaging/unity

Diff against target:

106 lines (+42/-29)

1 file modified

src/TrashLauncherIcon.cpp (+42/-29)

To merge this branch:

bzr merge lp://qastaging/~marcobiscaro2112/unity/2011-03-08

Related bugs:

Bug #723880: Wastebasket quicklist is missing “Empty Wastebasket” option when the wastebasket is empty	Low	Fix Released
Bug #730003: Emptying the trash from the unity sidebar should respect nautilus' "Ask before emptying" setting	Wishlist	Fix Released
Bug #731472: Empty trash quicklist item is missing an ellipsis	Low	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Neil J. Patel		2011-03-08	Pending
Review via email: mp+52611@code.qastaging.launchpad.net

Description of the change

    [launcher] Empty trash quicklist item is missing an ellipsis (LP: #731472)
    [launcher] Show disabled 'Empty trash' option when trash is already empty (LP: #723880)
    [dash] Adding ellipsis to 'Find XYZ' options (LP: #731162)