diff options
| author | Stefano Karapetsas <[email protected]> | 2013-03-03 13:51:41 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-03-03 13:51:41 +0100 |
| commit | c1d965ceb53bc91e47b4b944a0c7864ef7cded21 (patch) | |
| tree | 5aa15249636ea80b6fa313dd8d62bf3d4875fbd7 | |
| parent | 25a08e37283fc4c0b4689a3da791a7ad5e23a690 (diff) | |
| download | caja-c1d965ceb53bc91e47b4b944a0c7864ef7cded21.tar.bz2 caja-c1d965ceb53bc91e47b4b944a0c7864ef7cded21.tar.xz | |
Replace undocumented deprecated g_thread_gettime
Bump minimum glib version accordingly
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libcaja-private/caja-file-operations.c | 4 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-info.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index ca058137..eea7cf26 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.54) dnl =========================================================================== -m4_define(glib_minver, 2.25.12) +m4_define(glib_minver, 2.28.0) m4_define(gio_minver, 2.26.0) m4_define(mate_desktop_minver, 1.5.0) m4_define(pango_minver, 1.1.2) diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index f9f8739a..99fbe89f 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -1411,7 +1411,7 @@ report_delete_progress (CommonJob *job, guint64 now; char *files_left_s; - now = g_thread_gettime (); + now = g_get_monotonic_time () * 1000; if (transfer_info->last_report_time != 0 && ABS ((gint64)(transfer_info->last_report_time - now)) < 100 * NSEC_PER_MSEC) { return; @@ -2881,7 +2881,7 @@ report_copy_progress (CopyMoveJob *copy_job, is_move = copy_job->is_move; - now = g_thread_gettime (); + now = g_get_monotonic_time () * 1000; if (transfer_info->last_report_time != 0 && ABS ((gint64)(transfer_info->last_report_time - now)) < 100 * NSEC_PER_MSEC) { diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c index 5d783877..a32cf991 100644 --- a/libcaja-private/caja-icon-info.c +++ b/libcaja-private/caja-icon-info.c @@ -57,7 +57,7 @@ G_DEFINE_TYPE (CajaIconInfo, static void caja_icon_info_init (CajaIconInfo *icon) { - icon->last_use_time = g_thread_gettime (); + icon->last_use_time = g_get_monotonic_time () * 1000; icon->sole_owner = TRUE; } @@ -80,7 +80,7 @@ pixbuf_toggle_notify (gpointer info, g_object_remove_toggle_ref (object, pixbuf_toggle_notify, info); - icon->last_use_time = g_thread_gettime (); + icon->last_use_time = g_get_monotonic_time () * 1000; schedule_reap_cache (); } } @@ -228,7 +228,7 @@ reap_cache (gpointer data) reapable_icons_left = TRUE; - time_now = g_thread_gettime (); + time_now = g_get_monotonic_time () * 1000; if (loadable_icon_cache) { |