Marlin

Merge lp:~evfool/marlin/trash into lp:marlin/0.x

  1. trash
  2. Merge into trunk
Proposed by Robert Roth
Status: Merged
Merged at revision: 389
Proposed branch: lp:~evfool/marlin/trash
Merge into: lp:marlin/0.x
Diff against target: 15 lines (+4/-1)
1 file modified
libwidgets/LocationBar.vala (+4/-1)
To merge this branch: bzr merge lp:~evfool/marlin/trash
Reviewer Review Type Date Requested Status
xapantu Approve
Review via email: mp+66685@code.launchpad.net

Description of the change

Show Trash in the pathbar instead of the trash:/// uri.

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

It should be _("Trash"); instead of N_("Trash");, but it is ok :) Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libwidgets/LocationBar.vala'
2--- libwidgets/LocationBar.vala 2011-06-24 23:26:10 +0000
3+++ libwidgets/LocationBar.vala 2011-07-02 10:27:31 +0000
4@@ -714,7 +714,10 @@
5 }
6
7 newelements[0].text = protocol + newelements[0].text;
8-
9+ if (newelements[0].text == "trash:///")
10+ {
11+ newelements[0].text = N_("Trash");
12+ }
13 int max_path = 0;
14 if(newelements.size > elements.size)
15 {

Subscribers

People subscribed via source and target branches

to status/vote changes: