From 9539b0707e5b2928cfc1ccb38ec287c938d92cfb Mon Sep 17 00:00:00 2001
From: Sergios - Anestis Kefalidis <sergioskefalidis@gmail.com>
Date: Sat, 10 Jul 2021 13:07:35 +0300
Subject: [PATCH] Change thunar_file_is_trashed to thunar_file_is_trash in
thunar-launcher.c
---
thunar/thunar-launcher.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 324b50311..3044b0585 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -1540,7 +1540,7 @@ thunar_launcher_append_menu_item (ThunarLauncher *launcher,
case THUNAR_LAUNCHER_ACTION_MAKE_LINK:
show_item = thunar_file_is_writable (launcher->current_directory) &&
launcher->files_are_selected &&
- thunar_file_is_trashed (launcher->current_directory) == FALSE;
+ thunar_file_is_trash (launcher->current_directory) == FALSE;
if (!show_item && !force)
return NULL;
@@ -1555,7 +1555,7 @@ thunar_launcher_append_menu_item (ThunarLauncher *launcher,
case THUNAR_LAUNCHER_ACTION_DUPLICATE:
show_item = thunar_file_is_writable (launcher->current_directory) &&
launcher->files_are_selected &&
- thunar_file_is_trashed (launcher->current_directory) == FALSE;
+ thunar_file_is_trash (launcher->current_directory) == FALSE;
if (!show_item && !force)
return NULL;
item = xfce_gtk_menu_item_new (action_entry->menu_item_label_text, action_entry->menu_item_tooltip_text,
@@ -1566,7 +1566,7 @@ thunar_launcher_append_menu_item (ThunarLauncher *launcher,
case THUNAR_LAUNCHER_ACTION_RENAME:
show_item = thunar_file_is_writable (launcher->current_directory) &&
launcher->files_are_selected &&
- thunar_file_is_trashed (launcher->current_directory) == FALSE;
+ thunar_file_is_trash (launcher->current_directory) == FALSE;
if (!show_item && !force)
return NULL;
tooltip_text = ngettext ("Rename the selected file",
@@ -1577,7 +1577,7 @@ thunar_launcher_append_menu_item (ThunarLauncher *launcher,
return item;
case THUNAR_LAUNCHER_ACTION_RESTORE:
- if (launcher->files_are_selected && thunar_file_is_trashed (launcher->current_directory))
+ if (launcher->files_are_selected && thunar_file_is_trash (launcher->current_directory))
{
tooltip_text = ngettext ("Restore the selected file to its original location",
"Restore the selected files to its original location", launcher->n_files_to_process);
@@ -1589,7 +1589,7 @@ thunar_launcher_append_menu_item (ThunarLauncher *launcher,
return NULL;
case THUNAR_LAUNCHER_ACTION_RESTORE_SHOW:
- if (launcher->files_are_selected && thunar_file_is_trashed (launcher->current_directory))
+ if (launcher->files_are_selected && thunar_file_is_trash (launcher->current_directory))
{
tooltip_text = ngettext ("Restore the selected file to its original location and open the location in a new window/tab",
"Restore the selected files to their original locations and open the locations in a new window/tab", launcher->n_files_to_process);
@@ -1659,7 +1659,7 @@ thunar_launcher_append_menu_item (ThunarLauncher *launcher,
parent = launcher->single_folder;
else
parent = launcher->current_directory;
- if (thunar_file_is_trashed (parent))
+ if (thunar_file_is_trash (parent))
return NULL;
item = xfce_gtk_menu_item_new_from_action_entry (action_entry, G_OBJECT (launcher), GTK_MENU_SHELL (menu));
gtk_widget_set_sensitive (item, thunar_file_is_writable (parent));
@@ -1670,7 +1670,7 @@ thunar_launcher_append_menu_item (ThunarLauncher *launcher,
parent = launcher->single_folder;
else
parent = launcher->current_directory;
- if (thunar_file_is_trashed (parent))
+ if (thunar_file_is_trash (parent))
return NULL;
item = xfce_gtk_menu_item_new_from_action_entry (action_entry, G_OBJECT (launcher), GTK_MENU_SHELL (menu));
submenu = thunar_launcher_create_document_submenu_new (launcher);
@@ -2121,7 +2121,7 @@ thunar_launcher_action_make_link (ThunarLauncher *launcher)
if (G_UNLIKELY (launcher->current_directory == NULL))
return;
- if (launcher->files_are_selected == FALSE || thunar_file_is_trashed (launcher->current_directory))
+ if (launcher->files_are_selected == FALSE || thunar_file_is_trash (launcher->current_directory))
return;
for (lp = launcher->files_to_process; lp != NULL; lp = lp->next)
@@ -2150,7 +2150,7 @@ thunar_launcher_action_duplicate (ThunarLauncher *launcher)
if (G_UNLIKELY (launcher->current_directory == NULL))
return;
- if (launcher->files_are_selected == FALSE || thunar_file_is_trashed (launcher->current_directory))
+ if (launcher->files_are_selected == FALSE || thunar_file_is_trash (launcher->current_directory))
return;
/* determine the selected files for the view */
@@ -2340,7 +2340,7 @@ thunar_launcher_action_rename (ThunarLauncher *launcher)
if (launcher->files_to_process == NULL || g_list_length (launcher->files_to_process) == 0)
return;
- if (launcher->files_are_selected == FALSE || thunar_file_is_trashed (launcher->current_directory))
+ if (launcher->files_are_selected == FALSE || thunar_file_is_trash (launcher->current_directory))
return;
/* get the window */
@@ -2373,7 +2373,7 @@ thunar_launcher_action_restore (ThunarLauncher *launcher)
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
- if (launcher->files_are_selected == FALSE || !thunar_file_is_trashed (launcher->current_directory))
+ if (launcher->files_are_selected == FALSE || !thunar_file_is_trash (launcher->current_directory))
return;
/* restore the selected files */
@@ -2391,7 +2391,7 @@ thunar_launcher_action_restore_and_show (ThunarLauncher *launcher)
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
- if (launcher->files_are_selected == FALSE || !thunar_file_is_trashed (launcher->current_directory))
+ if (launcher->files_are_selected == FALSE || !thunar_file_is_trash (launcher->current_directory))
return;
/* restore the selected files */
@@ -2501,7 +2501,7 @@ thunar_launcher_action_create_folder (ThunarLauncher *launcher)
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
- if (thunar_file_is_trashed (launcher->current_directory))
+ if (thunar_file_is_trash (launcher->current_directory))
return;
/* ask the user to enter a name for the new folder */
@@ -2549,7 +2549,7 @@ thunar_launcher_action_create_document (ThunarLauncher *launcher,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
- if (thunar_file_is_trashed (launcher->current_directory))
+ if (thunar_file_is_trash (launcher->current_directory))
return;
template_file = g_object_get_qdata (G_OBJECT (menu_item), thunar_launcher_file_quark);
--
GitLab