diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-11-19 12:42:17 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2009-11-27 14:54:32 +0100 |
| commit | f67f8b4bc800d0096f26443fcd815675466e2b7f (patch) | |
| tree | a29e3f590b96a9623ebff89aed78a0966affc443 | |
| parent | d5be5ed688bfeb7a8514c2ae3659921f79cdd0eb (diff) | |
| download | nautilus-f67f8b4bc800d0096f26443fcd815675466e2b7f.tar.gz | |
Ensure ABS calls work on difference of unsigned values
guint64 - guint64 is of type guint64, so ABS doesn't work on it.
Cast to gint64 to make sure this works.
(cherry picked from commit 1f8f54f4777343dda87043e444a24c3f86e90439)
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 29d5e12b0..ba1020c61 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -1396,7 +1396,7 @@ report_delete_progress (CommonJob *job, now = g_thread_gettime (); if (transfer_info->last_report_time != 0 && - ABS (transfer_info->last_report_time - now) < 100 * NSEC_PER_MSEC) { + ABS ((gint64)(transfer_info->last_report_time - now)) < 100 * NSEC_PER_MSEC) { return; } transfer_info->last_report_time = now; @@ -2820,7 +2820,7 @@ report_copy_progress (CopyMoveJob *copy_job, now = g_thread_gettime (); if (transfer_info->last_report_time != 0 && - ABS (transfer_info->last_report_time - now) < 100 * NSEC_PER_MSEC) { + ABS ((gint64)(transfer_info->last_report_time - now)) < 100 * NSEC_PER_MSEC) { return; } transfer_info->last_report_time = now; |