summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2004-02-10 15:33:12 +0000
committerAlexander Larsson <alexl@src.gnome.org>2004-02-10 15:33:12 +0000
commitfec5d8d8c3eab97bb3129db0e82ee9441c37cd51 (patch)
tree359bb46023610b7aee9a9f4a6bccf18014e0ac27
parent174e3dde4df251bca0d70362557699b522b9d0ce (diff)
downloadnautilus-fec5d8d8c3eab97bb3129db0e82ee9441c37cd51.tar.gz
Load saved trash name on startup.
2004-02-10 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-desktop-link.c (nautilus_desktop_link_new): Load saved trash name on startup.
-rw-r--r--ChangeLog5
-rw-r--r--libnautilus-private/nautilus-desktop-link.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7893fb966..789f7752c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2004-02-10 Alexander Larsson <alexl@redhat.com>
+ * libnautilus-private/nautilus-desktop-link.c (nautilus_desktop_link_new):
+ Load saved trash name on startup.
+
+2004-02-10 Alexander Larsson <alexl@redhat.com>
+
* libnautilus-private/nautilus-icon-container.c (nautilus_icon_container_start_renaming_selected_item):
Select text in right order.
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index e8dd7d3e0..5d3ae3440 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -166,7 +166,7 @@ nautilus_desktop_link_new (NautilusDesktopLinkType type)
case NAUTILUS_DESKTOP_LINK_TRASH:
link->details->filename = g_strdup ("trash");
- link->details->display_name = g_strdup (_("Trash"));
+ link->details->display_name = eel_preferences_get (NAUTILUS_PREFERENCES_DESKTOP_TRASH_NAME);
link->details->activation_uri = g_strdup (EEL_TRASH_URI);
if (nautilus_trash_monitor_is_empty ()) {
link->details->icon = g_strdup (TRASH_EMPTY_ICON);