diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c index e45aa13e84..a1c563e7e8 100644 --- a/app/core/gimp-utils.c +++ b/app/core/gimp-utils.c @@ -730,7 +730,7 @@ gimp_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 && diff --git a/app/core/gimpdataloaderfactory.c b/app/core/gimpdataloaderfactory.c index 18728ba6b0..9b8397c4a2 100644 --- a/app/core/gimpdataloaderfactory.c +++ b/app/core/gimpdataloaderfactory.c @@ -382,13 +382,13 @@ gimp_data_loader_factory_load_directory (GimpDataFactory *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) diff --git a/app/core/gimpextensionmanager.c b/app/core/gimpextensionmanager.c index 8f7102f7b8..2b2f00e06e 100644 --- a/app/core/gimpextensionmanager.c +++ b/app/core/gimpextensionmanager.c @@ -1018,7 +1018,7 @@ gimp_extension_manager_search_directory (GimpExtensionManager *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; diff --git a/app/core/gimpimagefile.c b/app/core/gimpimagefile.c index fa43cec934..194e042b34 100644 --- a/app/core/gimpimagefile.c +++ b/app/core/gimpimagefile.c @@ -452,7 +452,7 @@ gimp_imagefile_create_thumbnail (GimpImagefile *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); @@ -715,7 +715,7 @@ gimp_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); } diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c index b91a0beb54..306e6ca9e2 100644 --- a/app/core/gimppalette-load.c +++ b/app/core/gimppalette-load.c @@ -1732,7 +1732,7 @@ gimp_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 = GIMP_PALETTE_FILE_FORMAT_ACT; diff --git a/app/file/file-open.c b/app/file/file-open.c index de2f2dd027..83813ab89d 100644 --- a/app/file/file-open.c +++ b/app/file/file-open.c @@ -130,7 +130,7 @@ file_open_image (Gimp *gimp, if (! info) return NULL; - if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR) + if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) != G_FILE_TYPE_REGULAR) { g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Not a regular file")); diff --git a/app/file/file-save.c b/app/file/file-save.c index 18a0a86fea..13914a2253 100644 --- a/app/file/file-save.c +++ b/app/file/file-save.c @@ -134,7 +134,7 @@ file_save (Gimp *gimp, goto out; } - if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR) + if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) != G_FILE_TYPE_REGULAR) { g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Not a regular file")); diff --git a/app/gui/icon-themes.c b/app/gui/icon-themes.c index 3fd1bfac2c..aeb28189ac 100644 --- a/app/gui/icon-themes.c +++ b/app/gui/icon-themes.c @@ -96,8 +96,8 @@ icon_themes_init (Gimp *gimp) while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - if (! g_file_info_get_is_hidden (info) && - g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) + if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) && + g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY) { GFile *file; GFile *index_theme; diff --git a/app/gui/splash.c b/app/gui/splash.c index a255967680..e2afd8fa14 100644 --- a/app/gui/splash.c +++ b/app/gui/splash.c @@ -595,7 +595,7 @@ splash_image_load_from_file (GFile *file, { const gchar *content_type; - content_type = g_file_info_get_content_type (info); + content_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); if (content_type) { gchar *mime_type; diff --git a/app/gui/themes.c b/app/gui/themes.c index 61ec918357..c29b603af7 100644 --- a/app/gui/themes.c +++ b/app/gui/themes.c @@ -511,8 +511,8 @@ themes_theme_paths_notify (GimpExtensionManager *manager, while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - if (! g_file_info_get_is_hidden (info) && - g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) + if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) && + g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY) { GFile *file; const gchar *name; diff --git a/app/plug-in/gimpenvirontable.c b/app/plug-in/gimpenvirontable.c index 82f2840022..f2148e2651 100644 --- a/app/plug-in/gimpenvirontable.c +++ b/app/plug-in/gimpenvirontable.c @@ -170,8 +170,8 @@ gimp_environ_table_load (GimpEnvironTable *environ_table, while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - if (! g_file_info_get_is_hidden (info) && - g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR) + if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) && + g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR) { GFile *file = g_file_enumerator_get_child (enumerator, info); diff --git a/app/plug-in/gimpinterpreterdb.c b/app/plug-in/gimpinterpreterdb.c index 123742ec2c..5a9202b58b 100644 --- a/app/plug-in/gimpinterpreterdb.c +++ b/app/plug-in/gimpinterpreterdb.c @@ -163,8 +163,8 @@ gimp_interpreter_db_load (GimpInterpreterDB *db, while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - if (! g_file_info_get_is_hidden (info) && - g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR) + if (! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) && + g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR) { GFile *file = g_file_enumerator_get_child (enumerator, info); diff --git a/app/plug-in/gimppluginmanager-file.c b/app/plug-in/gimppluginmanager-file.c index 07076e86d8..4f3e33c7d4 100644 --- a/app/plug-in/gimppluginmanager-file.c +++ b/app/plug-in/gimppluginmanager-file.c @@ -683,7 +683,7 @@ file_check_single_magic (const gchar *offset, if (! info) return FILE_MATCH_NONE; - fileval = g_file_info_get_size (info); + fileval = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); g_object_unref (info); } else if (offs >= 0 && diff --git a/app/plug-in/gimppluginmanager-restore.c b/app/plug-in/gimppluginmanager-restore.c index 5eca224644..b9cea12954 100644 --- a/app/plug-in/gimppluginmanager-restore.c +++ b/app/plug-in/gimppluginmanager-restore.c @@ -269,7 +269,7 @@ gimp_plug_in_manager_search_directory (GimpPlugInManager *manager, { 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; @@ -305,7 +305,7 @@ gimp_plug_in_manager_search_directory (GimpPlugInManager *manager, gchar *file_name; char *ext; - if (g_file_info_get_is_hidden (info2)) + if (g_file_info_get_attribute_boolean (info2, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN)) { g_object_unref (info2); continue; diff --git a/app/text/gimpfontfactory.c b/app/text/gimpfontfactory.c index 428ddaef47..e2c0c575b5 100644 --- a/app/text/gimpfontfactory.c +++ b/app/text/gimpfontfactory.c @@ -420,13 +420,13 @@ gimp_font_factory_recursive_add_fontdir (FcConfig *config, 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) @@ -892,4 +892,4 @@ gimp_font_factory_load_names (GimpContainer *container, FcFontSetDestroy (fontset); gimp_font_class_set_font_factory (container); -} \ No newline at end of file +} diff --git a/app/widgets/gimphelp.c b/app/widgets/gimphelp.c index 324b6e4625..6110f7e82e 100644 --- a/app/widgets/gimphelp.c +++ b/app/widgets/gimphelp.c @@ -257,7 +257,7 @@ gimp_help_get_installed_languages (void) while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) + if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY) { GFile *locale_dir; GFile *file; diff --git a/app/widgets/gimpimagepropview.c b/app/widgets/gimpimagepropview.c index e9563f9485..5ad3cb6060 100644 --- a/app/widgets/gimpimagepropview.c +++ b/app/widgets/gimpimagepropview.c @@ -338,7 +338,7 @@ gimp_image_prop_view_label_set_filesize (GtkWidget *label, if (info) { - goffset size = g_file_info_get_size (info); + goffset size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); gchar *str = g_format_size (size); gtk_label_set_text (GTK_LABEL (label), str); diff --git a/libgimpcolor/gimpcolorprofile.c b/libgimpcolor/gimpcolorprofile.c index 5ce2273e44..9d547692a4 100644 --- a/libgimpcolor/gimpcolorprofile.c +++ b/libgimpcolor/gimpcolorprofile.c @@ -216,7 +216,7 @@ gimp_color_profile_new_from_file (GFile *file, { GInputStream *input; - length = g_file_info_get_size (info); + length = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); data = g_malloc (length); g_object_unref (info); diff --git a/libgimpmodule/gimpmoduledb.c b/libgimpmodule/gimpmoduledb.c index 2867fe8e01..8183b0c22d 100644 --- a/libgimpmodule/gimpmoduledb.c +++ b/libgimpmodule/gimpmoduledb.c @@ -381,10 +381,10 @@ gimp_module_db_load_directory (GimpModuleDB *db, while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - 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); if (file_type == G_FILE_TYPE_REGULAR && - ! g_file_info_get_is_hidden (info)) + ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN)) { GFile *child = g_file_enumerator_get_child (enumerator, info); diff --git a/libgimpthumb/gimpthumb-utils.c b/libgimpthumb/gimpthumb-utils.c index 9d0886ce3c..fc306a8ec5 100644 --- a/libgimpthumb/gimpthumb-utils.c +++ b/libgimpthumb/gimpthumb-utils.c @@ -556,7 +556,7 @@ gimp_thumb_file_test (const gchar *filename, G_FILE_ATTRIBUTE_TIME_MODIFIED); if (size) - *size = g_file_info_get_size (info); + *size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); if (err_no) *err_no = 0; diff --git a/plug-ins/common/file-compressor.c b/plug-ins/common/file-compressor.c index 54fa2bd12c..e75fc3bdcd 100644 --- a/plug-ins/common/file-compressor.c +++ b/plug-ins/common/file-compressor.c @@ -1027,7 +1027,7 @@ get_file_info (GFile *file) if (info) { - size = g_file_info_get_size (info); + size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); g_object_unref (info); } diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c index 218580b726..158cd98fbb 100644 --- a/plug-ins/common/file-heif.c +++ b/plug-ins/common/file-heif.c @@ -659,7 +659,7 @@ get_file_size (GFile *file, NULL, error); if (info) { - size = g_file_info_get_size (info); + size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); g_object_unref (info); } diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c index a5c7ed1284..bba6f407d5 100644 --- a/plug-ins/common/file-raw-data.c +++ b/plug-ins/common/file-raw-data.c @@ -706,7 +706,7 @@ get_file_info (GFile *file) if (info) { - size = g_file_info_get_size (info); + size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); g_object_unref (info); } diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index a88bbcced2..03df14f513 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -392,7 +392,7 @@ send_image (GObject *config, while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - if (g_file_info_get_file_type (info) == G_FILE_TYPE_REGULAR) + if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_REGULAR) { GFile *file = g_file_enumerator_get_child (enumerator, info); g_file_delete (file, NULL, NULL); diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index d613c69f3b..64653f607d 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -132,7 +132,7 @@ background_jpeg_save (PreviewPersistent *pp) if (info) { - goffset size = g_file_info_get_size (info); + goffset size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); gchar *size_text; size_text = g_format_size (size); diff --git a/plug-ins/file-tiff/file-tiff-io.c b/plug-ins/file-tiff/file-tiff-io.c index c6a63e7ce8..8e282a1e68 100644 --- a/plug-ins/file-tiff/file-tiff-io.c +++ b/plug-ins/file-tiff/file-tiff-io.c @@ -571,7 +571,7 @@ tiff_io_get_file_size (thandle_t handle) } else { - size = g_file_info_get_size (info); + size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); g_object_unref (info); } diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c index 4885c219d6..8020ded574 100644 --- a/plug-ins/fractal-explorer/fractal-explorer.c +++ b/plug-ins/fractal-explorer/fractal-explorer.c @@ -1110,10 +1110,10 @@ fractalexplorer_list_load_all (const gchar *explorer_path) while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - 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); if (file_type == G_FILE_TYPE_REGULAR && - ! g_file_info_get_is_hidden (info)) + ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN)) { fractalexplorerOBJ *fractalexplorer; GFile *child; diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index e3e7ed028c..acb097184b 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -1772,10 +1772,10 @@ gflares_list_load_all (void) while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - 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); if (file_type == G_FILE_TYPE_REGULAR && - ! g_file_info_get_is_hidden (info)) + ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN)) { GFlare *gflare; GFile *child; diff --git a/plug-ins/help/gimphelplocale.c b/plug-ins/help/gimphelplocale.c index c31d044007..ca862e1568 100644 --- a/plug-ins/help/gimphelplocale.c +++ b/plug-ins/help/gimphelplocale.c @@ -258,7 +258,7 @@ gimp_help_locale_parse (GimpHelpLocale *locale, return FALSE; } - size = g_file_info_get_size (info); + size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE); g_object_unref (info); } diff --git a/plug-ins/script-fu/libscriptfu/script-fu-scripts.c b/plug-ins/script-fu/libscriptfu/script-fu-scripts.c index c3f10daee6..96e678875a 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-scripts.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-scripts.c @@ -316,11 +316,11 @@ script_fu_load_directory (GFile *directory) while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL))) { - 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); if ((file_type == G_FILE_TYPE_REGULAR || file_type == G_FILE_TYPE_DIRECTORY) && - ! g_file_info_get_is_hidden (info)) + ! g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN)) { GFile *child = g_file_enumerator_get_child (enumerator, info);