Import newer upstream.
This commit is contained in:
@ -734,7 +734,7 @@ pika_file_is_executable (GFile *file)
|
||||
|
||||
if (info)
|
||||
{
|
||||
GFileType file_type = g_file_info_get_file_type (info);
|
||||
GFileType file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
|
||||
const gchar *filename = g_file_info_get_name (info);
|
||||
|
||||
if (file_type == G_FILE_TYPE_REGULAR &&
|
||||
|
@ -386,13 +386,13 @@ pika_data_loader_factory_load_directory (PikaDataFactory *factory,
|
||||
GFileType file_type;
|
||||
GFile *child;
|
||||
|
||||
if (g_file_info_get_is_hidden (info))
|
||||
if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
|
||||
{
|
||||
g_object_unref (info);
|
||||
continue;
|
||||
}
|
||||
|
||||
file_type = g_file_info_get_file_type (info);
|
||||
file_type = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE);
|
||||
child = g_file_enumerator_get_child (enumerator, info);
|
||||
|
||||
if (file_type == G_FILE_TYPE_DIRECTORY)
|
||||
|
@ -1022,7 +1022,7 @@ pika_extension_manager_search_directory (PikaExtensionManager *manager,
|
||||
{
|
||||
GFile *subdir;
|
||||
|
||||
if (g_file_info_get_is_hidden (info))
|
||||
if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN))
|
||||
{
|
||||
g_object_unref (info);
|
||||
continue;
|
||||
|
@ -456,7 +456,7 @@ pika_imagefile_create_thumbnail (PikaImagefile *imagefile,
|
||||
G_FILE_QUERY_INFO_NONE,
|
||||
NULL, NULL);
|
||||
|
||||
regular = (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR);
|
||||
regular = (g_file_info_get_attribute_uint32 (file_info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR);
|
||||
readable = g_file_info_get_attribute_boolean (file_info,
|
||||
G_FILE_ATTRIBUTE_ACCESS_CAN_READ);
|
||||
|
||||
@ -719,7 +719,7 @@ pika_imagefile_icon_callback (GObject *source_object,
|
||||
|
||||
if (file_info)
|
||||
{
|
||||
private->icon = g_object_ref (g_file_info_get_icon (file_info));
|
||||
private->icon = g_object_ref (G_ICON (g_file_info_get_attribute_object (file_info, G_FILE_ATTRIBUTE_STANDARD_ICON)));
|
||||
g_object_unref (file_info);
|
||||
}
|
||||
|
||||
|
@ -1736,7 +1736,7 @@ pika_palette_load_detect_format (GFile *file,
|
||||
|
||||
if (info)
|
||||
{
|
||||
goffset size = g_file_info_get_size (info);
|
||||
goffset size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
|
||||
|
||||
if (size == 768)
|
||||
format = PIKA_PALETTE_FILE_FORMAT_ACT;
|
||||
|
Reference in New Issue
Block a user