elementaryart team mailing list archive

[Robert Roth <evfool@xxxxxxxxx>]

Robert Roth has proposed merging lp:~evfool/marlin/trash into lp:marlin.

Requested reviews:
  The elementary Project (elementaryproject)
Related bugs:
  Bug #797956 in Marlin: "Trash shows in pathbar as "trash:///""
  https://bugs.launchpad.net/marlin/+bug/797956

For more details, see:
https://code.launchpad.net/~evfool/marlin/trash/+merge/66685

Show Trash in the pathbar instead of the trash:/// uri.
-- 
https://code.launchpad.net/~evfool/marlin/trash/+merge/66685
Your team The elementary Project is requested to review the proposed merge of lp:~evfool/marlin/trash into lp:marlin.

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2011-06-24 23:26:10 +0000
+++ libwidgets/LocationBar.vala	2011-07-02 10:27:31 +0000
@@ -714,7 +714,10 @@
             }
             
             newelements[0].text = protocol + newelements[0].text;
-            
+            if (newelements[0].text == "trash:///") 
+            {
+                newelements[0].text = N_("Trash");
+            }
             int max_path = 0;
             if(newelements.size > elements.size)
             {