diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2000-11-16 16:59:21 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2000-11-16 16:59:21 +0000 |
| commit | e02becab6e97b35ee08e428b7116cd59bcba4c5f (patch) | |
| tree | 9f07c4e9ca26f684ed56c33cc35cbfbe4ac046be /libnautilus-extensions/nautilus-file-utilities.c | |
| parent | 11df9adb0e582ad978e46927bcb4ca4e7515dc6c (diff) | |
| download | nautilus-e02becab6e97b35ee08e428b7116cd59bcba4c5f.tar.gz | |
Added #define NAUTILUS_TRASH_URI "trash:"
* libnautilus-extensions/nautilus-file-utilities.h:
Added #define NAUTILUS_TRASH_URI "trash:"
* libnautilus-extensions/nautilus-directory.c:
(nautilus_self_check_directory):
* libnautilus-extensions/nautilus-drag.c:
(nautilus_drag_default_drop_action_for_icons):
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_make_uri_canonical),
(nautilus_self_check_file_utilities):
* libnautilus-extensions/nautilus-file.c:
(nautilus_self_check_file):
* src/file-manager/fm-desktop-icon-view.c:
(find_and_rename_trash_link), (create_or_rename_trash):
* src/file-manager/fm-directory-view.c: (show_trash_callback):
* src/file-manager/nautilus-trash-monitor.c:
(nautilus_trash_monitor_initialize):
Used NAUTILUS_TRASH_URI wherever "trash:" was used before.
Diffstat (limited to 'libnautilus-extensions/nautilus-file-utilities.c')
| -rw-r--r-- | libnautilus-extensions/nautilus-file-utilities.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c index b2ab669b5..7aea86f6d 100644 --- a/libnautilus-extensions/nautilus-file-utilities.c +++ b/libnautilus-extensions/nautilus-file-utilities.c @@ -291,7 +291,7 @@ nautilus_make_uri_canonical (const char *uri) * "trash:". */ if (nautilus_uri_is_trash (uri)) { - return g_strdup ("trash:"); + return g_strdup (NAUTILUS_TRASH_URI); } /* FIXME bugzilla.eazel.com 648: @@ -1359,10 +1359,10 @@ nautilus_self_check_file_utilities (void) NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("file:"), "file:"); NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash"), "file:///trash"); NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("glorp:"), "glorp:"); - NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("TRASH:XXX"), "trash:"); - NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash:xxx"), "trash:"); - NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("GNOME-TRASH:XXX"), "trash:"); - NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("gnome-trash:xxx"), "trash:"); + NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("TRASH:XXX"), NAUTILUS_TRASH_URI); + NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("trash:xxx"), NAUTILUS_TRASH_URI); + NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("GNOME-TRASH:XXX"), NAUTILUS_TRASH_URI); + NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("gnome-trash:xxx"), NAUTILUS_TRASH_URI); NAUTILUS_CHECK_STRING_RESULT (nautilus_make_uri_canonical ("pipe:gnome-info2html2 as"), "pipe:gnome-info2html2 as"); |