Merge branch '2907-revert-gfileinfo-criticals' into 'main'

gfileinfo: Temporarily downgrade missing attribute criticals to debugs

See merge request GNOME/glib!3338
This commit is contained in:
Philip Withnall 2023-03-21 16:15:37 +00:00
commit 2aaa3250c9

View File

@ -1500,8 +1500,8 @@ g_file_info_set_attribute_int64 (GFileInfo *info,
*value_ptr = g_file_info_find_value (info, attr); \ *value_ptr = g_file_info_find_value (info, attr); \
if (G_UNLIKELY (*value_ptr == NULL)) \ if (G_UNLIKELY (*value_ptr == NULL)) \
{ \ { \
g_critical ("GFileInfo created without " attribute_name); \ g_debug ("GFileInfo created without " attribute_name); \
g_return_val_if_reached (error_value); \ return error_value; \
} \ } \
} G_STMT_END } G_STMT_END
@ -1837,9 +1837,9 @@ g_file_info_get_modification_time (GFileInfo *info,
if (G_UNLIKELY (value == NULL)) if (G_UNLIKELY (value == NULL))
{ {
g_critical ("GFileInfo created without " G_FILE_ATTRIBUTE_TIME_MODIFIED); g_debug ("GFileInfo created without " G_FILE_ATTRIBUTE_TIME_MODIFIED);
result->tv_sec = result->tv_usec = 0; result->tv_sec = result->tv_usec = 0;
g_return_if_reached (); return;
} }
result->tv_sec = _g_file_attribute_value_get_uint64 (value); result->tv_sec = _g_file_attribute_value_get_uint64 (value);