mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-11-05 16:04:31 +00:00
Update the icon even when newly creating it, in case the trash state
* src/file-manager/fm-desktop-icon-view.c (update_trash_link_and_delete_copies): Update the icon even when newly creating it, in case the trash state changed while the desktop was off. This fixes bug 7956 (improper Trash icon state after desktop toggle )
This commit is contained in:
parent
8d074785a4
commit
763194bfef
2 changed files with 17 additions and 11 deletions
|
@ -1,3 +1,11 @@
|
|||
2001-07-22 Maciej Stachowiak <mjs@noisehavoc.org>
|
||||
|
||||
* src/file-manager/fm-desktop-icon-view.c
|
||||
(update_trash_link_and_delete_copies): Update the icon even when
|
||||
newly creating it, in case the trash state changed while the
|
||||
desktop was off. This fixes bug 7956 (improper Trash icon state
|
||||
after desktop toggle )
|
||||
|
||||
2001-07-22 Maciej Stachowiak <mjs@noisehavoc.org>
|
||||
|
||||
* libnautilus-private/nautilus-directory-async.c
|
||||
|
|
|
@ -1015,19 +1015,17 @@ update_trash_link_and_delete_copies (void)
|
|||
{
|
||||
|
||||
/* Check for trash link */
|
||||
if (update_link_and_delete_copies (nautilus_link_local_is_trash_link,
|
||||
TRASH_LINK_NAME,
|
||||
EEL_TRASH_URI)) {
|
||||
return;
|
||||
if (!update_link_and_delete_copies (nautilus_link_local_is_trash_link,
|
||||
TRASH_LINK_NAME,
|
||||
EEL_TRASH_URI)) {
|
||||
nautilus_link_local_create (desktop_directory,
|
||||
TRASH_LINK_NAME,
|
||||
"trash-empty",
|
||||
EEL_TRASH_URI,
|
||||
NULL,
|
||||
NAUTILUS_LINK_TRASH);
|
||||
}
|
||||
|
||||
nautilus_link_local_create (desktop_directory,
|
||||
TRASH_LINK_NAME,
|
||||
"trash-empty",
|
||||
EEL_TRASH_URI,
|
||||
NULL,
|
||||
NAUTILUS_LINK_TRASH);
|
||||
|
||||
/* Make sure link represents current trash state */
|
||||
fm_desktop_icon_view_trash_state_changed_callback (nautilus_trash_monitor_get (),
|
||||
nautilus_trash_monitor_is_empty (),
|
||||
|
|
Loading…
Reference in a new issue