diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2011-10-18 11:23:13 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-10-18 11:28:08 -0400 |
| commit | 0594aa1636ef960361cf60d00c58ab94c81ee5d4 (patch) | |
| tree | 4901787972b19b88aeac4b286985fe02dc5a9013 /libnautilus-private/nautilus-icon-info.c | |
| parent | 04975e6cbc8f82238e3611a26b474b56c46ec1d3 (diff) | |
| download | nautilus-0594aa1636ef960361cf60d00c58ab94c81ee5d4.tar.gz | |
all: don't use deprecated GMutex/GThread API
Also, threads area always enabled, so we can remove the
G_THREADS_ENABLED conditionals.
Require GLib 2.31 for this.
Diffstat (limited to 'libnautilus-private/nautilus-icon-info.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-info.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c index 77075b039..1006572e2 100644 --- a/libnautilus-private/nautilus-icon-info.c +++ b/libnautilus-private/nautilus-icon-info.c @@ -31,7 +31,7 @@ struct _NautilusIconInfo GObject parent; gboolean sole_owner; - guint64 last_use_time; + gint64 last_use_time; GdkPixbuf *pixbuf; gboolean got_embedded_rect; @@ -56,7 +56,7 @@ G_DEFINE_TYPE (NautilusIconInfo, static void nautilus_icon_info_init (NautilusIconInfo *icon) { - icon->last_use_time = g_thread_gettime (); + icon->last_use_time = g_get_monotonic_time (); icon->sole_owner = TRUE; } @@ -78,7 +78,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 (); schedule_reap_cache (); } } @@ -182,7 +182,7 @@ static GHashTable *loadable_icon_cache = NULL; static GHashTable *themed_icon_cache = NULL; static guint reap_cache_timeout = 0; -#define NSEC_PER_SEC ((guint64)1000000000L) +#define MICROSEC_PER_SEC ((guint64)1000000L) static guint time_now; @@ -195,7 +195,7 @@ reap_old_icon (gpointer key, gboolean *reapable_icons_left = user_info; if (icon->sole_owner) { - if (time_now - icon->last_use_time > 30 * NSEC_PER_SEC) { + if (time_now - icon->last_use_time > 30 * MICROSEC_PER_SEC) { /* This went unused 30 secs ago. reap */ return TRUE; } else { @@ -214,7 +214,7 @@ reap_cache (gpointer data) reapable_icons_left = TRUE; - time_now = g_thread_gettime (); + time_now = g_get_monotonic_time (); if (loadable_icon_cache) { g_hash_table_foreach_remove (loadable_icon_cache, |