Skip to content

MarlinFileOperations simplify: Lose unused "debuting_files" #2830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeremypw wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −32
Open

MarlinFileOperations simplify: Lose unused "debuting_files" #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion libcore/FileOperations/CopyMoveJob.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public class Files.FileOperations.CopyMoveJob : CommonJob {
protected bool is_move = false;
protected GLib.List<GLib.File> files;
protected GLib.File? destination;
protected GLib.HashTable<GLib.File,bool> debuting_files = new GLib.HashTable<GLib.File,bool> (GLib.File.hash, GLib.File.equal);
protected bool replace_all = false;
protected bool merge_all = false;
protected bool keep_all_newest = false;
Expand Down
34 changes: 3 additions & 31 deletions libcore/marlin-file-operations.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,6 @@ static void copy_move_file (FilesFileOperationsCopyMoveJob *job,
char **dest_fs_type,
SourceInfo *source_info,
TransferInfo *transfer_info,
GHashTable *debuting_files,
gboolean overwrite,
gboolean *skipped_file,
gboolean readonly_source_fs);
Expand Down Expand Up @@ -1006,7 +1005,6 @@ copy_move_directory (FilesFileOperationsCopyMoveJob *copy_job,
char **parent_dest_fs_type,
SourceInfo *source_info,
TransferInfo *transfer_info,
GHashTable *debuting_files,
gboolean *skipped_file,
gboolean readonly_source_fs)
{
Expand Down Expand Up @@ -1040,9 +1038,6 @@ copy_move_directory (FilesFileOperationsCopyMoveJob *copy_job,
break;
}

if (debuting_files) {
g_hash_table_replace (debuting_files, g_object_ref (*dest), GINT_TO_POINTER (TRUE));
}

}

Expand All @@ -1065,7 +1060,7 @@ copy_move_directory (FilesFileOperationsCopyMoveJob *copy_job,
src_file = g_file_get_child (src,
g_file_info_get_name (info));
copy_move_file (copy_job, src_file, *dest, same_fs, FALSE, &dest_fs_type,
source_info, transfer_info, NULL, FALSE, &local_skipped_file,
source_info, transfer_info, FALSE, &local_skipped_file,
readonly_source_fs);
g_object_unref (src_file);
g_object_unref (info);
Expand Down Expand Up @@ -1123,9 +1118,6 @@ copy_move_directory (FilesFileOperationsCopyMoveJob *copy_job,
transfer_info->num_files ++;
marlin_file_operations_copy_move_job_report_copy_progress (copy_job, source_info, transfer_info);

if (debuting_files) {
g_hash_table_replace (debuting_files, g_object_ref (*dest), GINT_TO_POINTER (create_dest));
}
} else if (IS_IO_ERROR (error, CANCELLED)) {
g_error_free (error);
} else {
Expand Down Expand Up @@ -1526,7 +1518,6 @@ copy_move_file (FilesFileOperationsCopyMoveJob *copy_job,
char **dest_fs_type,
SourceInfo *source_info,
TransferInfo *transfer_info,
GHashTable *debuting_files,
gboolean overwrite,
gboolean *skipped_file,
gboolean readonly_source_fs)
Expand Down Expand Up @@ -1677,15 +1668,7 @@ copy_move_file (FilesFileOperationsCopyMoveJob *copy_job,
transfer_info->num_files ++;
marlin_file_operations_copy_move_job_report_copy_progress (copy_job, source_info, transfer_info);

if (debuting_files) {
/*if (position) {
//files_file_changes_queue_schedule_position_set (dest, *position, job->screen_num);
} else {
//files_file_changes_queue_schedule_position_remove (dest);
}*/

g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
}
if (copy_job->is_move) {
files_file_changes_queue_file_moved (src, dest);
} else {
Expand Down Expand Up @@ -1905,7 +1888,7 @@ copy_move_file (FilesFileOperationsCopyMoveJob *copy_job,
if (!copy_move_directory (copy_job, src, &dest, same_fs,
would_recurse, dest_fs_type,
source_info, transfer_info,
debuting_files, skipped_file,
skipped_file,
readonly_source_fs)) {
/* destination changed, since it was an invalid file name */
g_assert (*dest_fs_type != NULL);
Expand Down Expand Up @@ -2022,7 +2005,6 @@ copy_files (FilesFileOperationsCopyMoveJob *job,
same_fs, unique_names,
&dest_fs_type, //dest_fs_type always null?
source_info, transfer_info,
job->debuting_files,
FALSE, &skipped_file,
readonly_source_fs);
g_object_unref (dest);
Expand Down Expand Up @@ -2164,7 +2146,6 @@ move_file_prepare (FilesFileOperationsCopyMoveJob *move_job,
GFile *dest_dir,
gboolean same_fs,
char **dest_fs_type,
GHashTable *debuting_files,
GList **fallback_files,
int files_left)
{
Expand Down Expand Up @@ -2231,9 +2212,6 @@ move_file_prepare (FilesFileOperationsCopyMoveJob *move_job,
NULL,
&error)) {

if (debuting_files) {
g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
}

files_file_changes_queue_file_moved (src, dest);

Expand Down Expand Up @@ -2417,7 +2395,6 @@ move_files_prepare (FilesFileOperationsCopyMoveJob *job,

move_file_prepare (job, src, job->destination,
same_fs, dest_fs_type,
job->debuting_files,
fallbacks,
left);
marlin_file_operations_copy_move_job_report_move_progress (job, total, --left);
Expand Down Expand Up @@ -2465,7 +2442,6 @@ move_files (FilesFileOperationsCopyMoveJob *job,
copy_move_file (job, src, job->destination,
same_fs, FALSE, dest_fs_type,
source_info, transfer_info,
job->debuting_files,
fallback->overwrite, &skipped_file, FALSE);
i++;
}
Expand Down Expand Up @@ -2584,7 +2560,6 @@ static void
link_file (FilesFileOperationsCopyMoveJob *job,
GFile *src, GFile *dest_dir,
char **dest_fs_type,
GHashTable *debuting_files,
int files_left)
{
GFile *src_dir, *dest, *new_dest;
Expand Down Expand Up @@ -2628,9 +2603,6 @@ link_file (FilesFileOperationsCopyMoveJob *job,

g_free (path);

if (debuting_files) {
g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
}
files_file_changes_queue_file_added (dest, TRUE);

g_object_unref (dest);
Expand Down Expand Up @@ -2758,7 +2730,7 @@ link_job (GTask *task,


link_file (job, src, job->destination,
&dest_fs_type, job->debuting_files,
&dest_fs_type,
left);
marlin_file_operations_copy_move_job_report_link_progress (job, total, --left);
i++;
Expand Down