Skip to content

Improve appearance of job window for long running empty trash jobs #1105

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

Merged
merged 2 commits into from
Mar 3, 2016
Merged

Improve appearance of job window for long running empty trash jobs #1105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36727a
nemo-file-operations: add info to empty trash job window
itzexor Feb 26, 2016
c434d82
file-operations: only pulse progress every 100 deletions when emptyin…
itzexor Feb 26, 2016
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
14 changes: 12 additions & 2 deletions libnemo-private/nemo-file-operations.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6437,6 +6437,7 @@ nemo_file_operations_new_file (GtkWidget *parent_view,
static void
delete_trash_file (CommonJob *job,
GFile *file,
int *deletions_since_progress,
gboolean del_file,
gboolean del_children)
{
Expand All @@ -6460,7 +6461,7 @@ delete_trash_file (CommonJob *job,
(info = g_file_enumerator_next_file (enumerator, job->cancellable, NULL)) != NULL) {
child = g_file_get_child (file,
g_file_info_get_name (info));
delete_trash_file (job, child, TRUE,
delete_trash_file (job, child, deletions_since_progress, TRUE,
g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
g_object_unref (child);
g_object_unref (info);
Expand All @@ -6472,6 +6473,11 @@ delete_trash_file (CommonJob *job,

if (!job_aborted (job) && del_file) {
g_file_delete (file, job->cancellable, NULL);

if ((*deletions_since_progress)++ > 100) {
nemo_progress_info_pulse_progress (job->progress);
*deletions_since_progress = 0;
}
}
}

Expand Down Expand Up @@ -6502,6 +6508,7 @@ empty_trash_job (GIOSchedulerJob *io_job,
CommonJob *common;
GList *l;
gboolean confirmed;
int deletions_since_progress = 0;

common = (CommonJob *)job;
common->io_job = io_job;
Expand All @@ -6514,10 +6521,13 @@ empty_trash_job (GIOSchedulerJob *io_job,
confirmed = TRUE;
}
if (confirmed) {
nemo_progress_info_set_status (common->progress, _("Emptying Trash"));
nemo_progress_info_set_details (common->progress, _("Emptying Trash"));

for (l = job->trash_dirs;
l != NULL && !job_aborted (common);
l = l->next) {
delete_trash_file (common, l->data, FALSE, TRUE);
delete_trash_file (common, l->data, &deletions_since_progress, FALSE, TRUE);
}
}

Expand Down