isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/icon-theme: Replace g_get_current_time ()

Browse Source 
GTimeVal has been deprecated a while ago, don't let it sneak back
in via some old GTK code.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2620>
This commit is contained in:
Florian Müllner 2023-02-01 16:25:10 +01:00 committed by Marge Bot
parent d65de0df60
commit b10a0ec45b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/st/st-icon-theme.c
View File

@ -105,7 +105,7 @@ struct _GtkIconTheme
GHashTable *unthemed_icons; GHashTable *unthemed_icons;
/* time when we last stat:ed for theme changes */ /* time when we last stat:ed for theme changes */
glong last_stat_time; int64_t last_stat_time;
GList *dir_mtimes; GList *dir_mtimes;
guint theme_changed_idle; guint theme_changed_idle;
@ -1016,7 +1016,6 @@ load_themes (GtkIconTheme *icon_theme)
int base; int base;
char *dir; char *dir;
const char *file; const char *file;
GTimeVal tv;
IconThemeDirMtime *dir_mtime; IconThemeDirMtime *dir_mtime;
GStatBuf stat_buf; GStatBuf stat_buf;
GList *d; GList *d;
@ -1088,14 +1087,12 @@ load_themes (GtkIconTheme *icon_theme)
icon_theme->themes_valid = TRUE; icon_theme->themes_valid = TRUE;
g_get_current_time (&tv); icon_theme->last_stat_time = g_get_monotonic_time ();
icon_theme->last_stat_time = tv.tv_sec;
} }
static void static void
ensure_valid_themes (GtkIconTheme *icon_theme) ensure_valid_themes (GtkIconTheme *icon_theme)
{ {
GTimeVal tv;
gboolean was_valid = icon_theme->themes_valid; gboolean was_valid = icon_theme->themes_valid;
if (icon_theme->loading_themes) if (icon_theme->loading_themes)
@ -1104,9 +1101,9 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
if (icon_theme->themes_valid) if (icon_theme->themes_valid)
{ {
g_get_current_time (&tv); int64_t time = g_get_monotonic_time ();
if (ABS (tv.tv_sec - icon_theme->last_stat_time) > 5 && if (ABS (time - icon_theme->last_stat_time) > 5 * G_TIME_SPAN_SECOND &&
rescan_themes (icon_theme)) rescan_themes (icon_theme))
{ {
g_hash_table_remove_all (icon_theme->info_cache); g_hash_table_remove_all (icon_theme->info_cache);
@ -2215,7 +2212,6 @@ rescan_themes (GtkIconTheme *icon_theme)
GList *d; GList *d;
int stat_res; int stat_res;
GStatBuf stat_buf; GStatBuf stat_buf;
GTimeVal tv;
for (d = icon_theme->dir_mtimes; d != NULL; d = d->next) for (d = icon_theme->dir_mtimes; d != NULL; d = d->next)
{ {
@ -2236,8 +2232,7 @@ rescan_themes (GtkIconTheme *icon_theme)
return TRUE; return TRUE;
} }
g_get_current_time (&tv); icon_theme->last_stat_time = g_get_monotonic_time ();
icon_theme->last_stat_time = tv.tv_sec;
return FALSE; return FALSE;
} }