summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2005-07-23 17:47:14 +0000
committerMartin Wehner <mwehner@src.gnome.org>2005-07-23 17:47:14 +0000
commitba5fa83cdc17ab990617bc45235372cdd734ff08 (patch)
tree525ee239922f91f846fef55b1b148106dea418f7
parentba76c0d532c4f5bbc76d250203c8fa4d48ee7027 (diff)
downloadnautilus-ba5fa83cdc17ab990617bc45235372cdd734ff08.tar.gz
Don't use trash icon for location button delete action. Fixes #310414.
2005-07-23 Martin Wehner <martin.wehner@gmail.com> * src/file-manager/fm-directory-view.c: Don't use trash icon for location button delete action. Fixes #310414. Patch from Christian Neumair <chris@gnome-de.org>
-rw-r--r--ChangeLog8
-rw-r--r--src/file-manager/fm-directory-view.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 910cbffab..5f8c8f269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-07-23 Martin Wehner <martin.wehner@gmail.com>
+ * src/file-manager/fm-directory-view.c:
+ Don't use trash icon for location button delete action.
+ Fixes #310414.
+
+ Patch from Christian Neumair <chris@gnome-de.org>
+
+2005-07-23 Martin Wehner <martin.wehner@gmail.com>
+
* src/nautilus-desktop-window.c: (real_get_icon_name),
(nautilus_desktop_window_class_init):
* src/nautilus-navigation-window.c: (real_get_icon_name),
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 13168ee43..843197bb2 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -6248,7 +6248,7 @@ static const GtkActionEntry directory_view_entries[] = {
N_("Mo_ve to Trash"), "", /* label, accelerator */
N_("Move this folder to the Trash"), /* tooltip */
G_CALLBACK (action_location_trash_callback) },
- { FM_ACTION_LOCATION_DELETE, GTK_STOCK_DELETE, /* name, stock id */
+ { FM_ACTION_LOCATION_DELETE, NULL, /* name, stock id */
N_("_Delete"), "", /* label, accelerator */
N_("Delete this folder, without moving to the Trash"), /* tooltip */
G_CALLBACK (action_location_delete_callback) },