luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 15:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1791-macos-get-mime-dirs' into 'master'

Browse Source 
gcontenttype: Add no-op versions of {get,set}_mime_dirs() on win32/macOS

Closes #1791

See merge request GNOME/glib!927
This commit is contained in:
Emmanuele Bassi 2019-07-25 13:48:04 +00:00
commit 298ee8f87c
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gcontenttype-win32.c
View File

@ -83,6 +83,21 @@ get_registry_classes_key (const char *subdir,
return value_utf8; return value_utf8;
} }
/*< private >*/
void
g_content_type_set_mime_dirs (const gchar * const *dirs)
{
/* noop on Windows */
}
/*< private >*/
const gchar * const *
g_content_type_get_mime_dirs (void)
{
const gchar * const *mime_dirs = { NULL };
return mime_dirs;
}
gboolean gboolean
g_content_type_equals (const gchar *type1, g_content_type_equals (const gchar *type1,
const gchar *type2) const gchar *type2)

15
gio/gosxcontenttype.m
View File

@ -100,6 +100,21 @@ create_cstr_from_cfstring_with_fallback (CFStringRef str,
return cstr; return cstr;
} }
/*< private >*/
void
g_content_type_set_mime_dirs (const gchar * const *dirs)
{
/* noop on macOS */
}
/*< private >*/
const gchar * const *
g_content_type_get_mime_dirs (void)
{
const gchar * const *mime_dirs = { NULL };
return mime_dirs;
}
gboolean gboolean
g_content_type_equals (const gchar *type1, g_content_type_equals (const gchar *type1,
const gchar *type2) const gchar *type2)