From 7bec6327a2b7d9ea1b0a30b8d6f91d80ef6d323a Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 24 Jul 2024 15:12:56 +0200 Subject: [PATCH] gio: Rename gcontenttype.c to gcontenttype-fdo.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reflects its status as actually platform-dependent: it’s only built on systems using the freedesktop.org content type system. It makes the file naming match up with other platform-specific implementations, such as `gcontenttype-win32.c` and `gcontenttype-osx.m`. A subsequent commit will introduce a platform-independent high level API wrapper so that the introspection annotations from this file can be reused between platforms. Signed-off-by: Philip Withnall Helps: #3399 --- gio/{gcontenttype.c => gcontenttype-fdo.c} | 0 gio/meson.build | 2 +- po/POTFILES.in | 2 +- tools/glib.supp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename gio/{gcontenttype.c => gcontenttype-fdo.c} (100%) diff --git a/gio/gcontenttype.c b/gio/gcontenttype-fdo.c similarity index 100% rename from gio/gcontenttype.c rename to gio/gcontenttype-fdo.c diff --git a/gio/meson.build b/gio/meson.build index 21c409a1d..6870dbce8 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -405,7 +405,7 @@ if host_system != 'windows' ) application_headers += files('gosxappinfo.h') else - contenttype_sources += files('gcontenttype.c') + contenttype_sources += files('gcontenttype-fdo.c') unix_sources += files('gdesktopappinfo.c') gio_unix_include_headers += files('gdesktopappinfo.h') launch_desktop_sources = files('gio-launch-desktop.c') diff --git a/po/POTFILES.in b/po/POTFILES.in index 8be46bf29..bfe244769 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -12,7 +12,7 @@ gio/gbufferedoutputstream.c gio/gbytesicon.c gio/gcancellable.c gio/gcharsetconverter.c -gio/gcontenttype.c +gio/gcontenttype-fdo.c gio/gcontenttype-win32.c gio/gconverter.c gio/gconverterinputstream.c diff --git a/tools/glib.supp b/tools/glib.supp index bddfe603e..5e4fbd23e 100644 --- a/tools/glib.supp +++ b/tools/glib.supp @@ -896,7 +896,7 @@ fun:g_get_home_dir } -# gcontenttype.c caches a one-time allocation global array of @global_mime_dirs. +# gcontenttype-fdo.c caches a one-time allocation global array of @global_mime_dirs. { content_type_mime_dirs_realloc Memcheck:Leak