diff --git a/gio/xdgmime/xdgmime.c b/gio/xdgmime/xdgmime.c index d178e06b0..691976d42 100644 --- a/gio/xdgmime/xdgmime.c +++ b/gio/xdgmime/xdgmime.c @@ -489,6 +489,8 @@ xdg_mime_get_mime_type_for_data (const void *data, return _xdg_binary_or_text_fallback(data, len); } +#ifdef NOT_USED_IN_GIO + const char * xdg_mime_get_mime_type_for_file (const char *file_name, struct stat *statbuf) @@ -584,6 +586,8 @@ xdg_mime_get_mime_type_from_file_name (const char *file_name) return XDG_MIME_TYPE_UNKNOWN; } +#endif + int xdg_mime_get_mime_types_from_file_name (const char *file_name, const char *mime_types[], @@ -597,6 +601,8 @@ xdg_mime_get_mime_types_from_file_name (const char *file_name, return _xdg_glob_hash_lookup_file_name (global_hash, file_name, mime_types, n_mime_types); } +#ifdef NOT_USED_IN_GIO + int xdg_mime_is_valid_mime_type (const char *mime_type) { @@ -605,6 +611,8 @@ xdg_mime_is_valid_mime_type (const char *mime_type) return _xdg_utf8_validate (mime_type); } +#endif + void xdg_mime_shutdown (void) { @@ -820,14 +828,19 @@ xdg_mime_mime_type_subclass (const char *mime, char ** xdg_mime_list_mime_parents (const char *mime) { + const char *umime; const char **parents; char **result; int i, n; + xdg_mime_init (); + if (_caches) return _xdg_mime_cache_list_mime_parents (mime); - parents = xdg_mime_get_mime_parents (mime); + umime = _xdg_mime_unalias_mime_type (mime); + + parents = _xdg_mime_parent_list_lookup (parent_list, umime); if (!parents) return NULL; @@ -841,6 +854,8 @@ xdg_mime_list_mime_parents (const char *mime) return result; } +#ifdef NOT_USED_IN_GIO + const char ** xdg_mime_get_mime_parents (const char *mime) { @@ -870,6 +885,7 @@ xdg_mime_dump (void) _xdg_mime_cache_glob_dump (); } +#endif /* Registers a function to be called every time the mime database reloads its files */ @@ -897,6 +913,8 @@ xdg_mime_register_reload_callback (XdgMimeCallback callback, return callback_id - 1; } +#ifdef NOT_USED_IN_GIO + void xdg_mime_remove_callback (int callback_id) { @@ -922,6 +940,8 @@ xdg_mime_remove_callback (int callback_id) } } +#endif + const char * xdg_mime_get_icon (const char *mime) { diff --git a/gio/xdgmime/xdgmime.h b/gio/xdgmime/xdgmime.h index 6a34edfc3..831a76f17 100644 --- a/gio/xdgmime/xdgmime.h +++ b/gio/xdgmime/xdgmime.h @@ -73,9 +73,9 @@ typedef void (*XdgMimeDestroy) (void *user_data); #define xdg_mime_get_icon XDG_ENTRY(get_icon) #define xdg_mime_get_generic_icon XDG_ENTRY(get_generic_icon) -#define _xdg_mime_mime_type_equal XDG_RESERVED_ENTRY(mime_type_equal) #define _xdg_mime_mime_type_subclass XDG_RESERVED_ENTRY(mime_type_subclass) -#define _xdg_mime_unalias_mime_type XDG_RESERVED_ENTRY(unalias_mime_type) +#define _xdg_mime_mime_type_equal XDG_RESERVED_ENTRY(mime_type_equal) +#define _xdg_mime_unalias_mime_type XDG_RESERVED_ENTRY(unalias_mime_type) #endif extern const char xdg_mime_type_unknown[]; @@ -88,13 +88,17 @@ extern const char xdg_mime_type_textplain[]; const char *xdg_mime_get_mime_type_for_data (const void *data, size_t len, int *result_prio); +#ifdef NOT_USED_IN_GIO const char *xdg_mime_get_mime_type_for_file (const char *file_name, struct stat *statbuf); const char *xdg_mime_get_mime_type_from_file_name (const char *file_name); +#endif int xdg_mime_get_mime_types_from_file_name(const char *file_name, const char *mime_types[], int n_mime_types); +#ifdef NOT_USED_IN_GIO int xdg_mime_is_valid_mime_type (const char *mime_type); +#endif int xdg_mime_mime_type_equal (const char *mime_a, const char *mime_b); int xdg_mime_media_type_equal (const char *mime_a, @@ -106,18 +110,24 @@ int xdg_mime_mime_type_subclass (const char *mime_a, * instead, but notice that that function expects you to free * the array it returns. */ +#ifdef NOT_USED_IN_GIO const char **xdg_mime_get_mime_parents (const char *mime); +#endif char ** xdg_mime_list_mime_parents (const char *mime); const char *xdg_mime_unalias_mime_type (const char *mime); const char *xdg_mime_get_icon (const char *mime); const char *xdg_mime_get_generic_icon (const char *mime); int xdg_mime_get_max_buffer_extents (void); void xdg_mime_shutdown (void); +#ifdef NOT_USED_IN_GIO void xdg_mime_dump (void); +#endif int xdg_mime_register_reload_callback (XdgMimeCallback callback, void *data, XdgMimeDestroy destroy); +#ifdef NOT_USED_IN_GIO void xdg_mime_remove_callback (int callback_id); +#endif /* Private versions of functions that don't call xdg_mime_init () */ int _xdg_mime_mime_type_equal (const char *mime_a, diff --git a/gio/xdgmime/xdgmimealias.c b/gio/xdgmime/xdgmimealias.c index 07d89eb32..ad813e579 100644 --- a/gio/xdgmime/xdgmimealias.c +++ b/gio/xdgmime/xdgmimealias.c @@ -165,6 +165,8 @@ _xdg_mime_alias_read_from_file (XdgAliasList *list, } +#ifdef NOT_USED_IN_GIO + void _xdg_mime_alias_list_dump (XdgAliasList *list) { @@ -181,4 +183,4 @@ _xdg_mime_alias_list_dump (XdgAliasList *list) } } - +#endif diff --git a/gio/xdgmime/xdgmimealias.h b/gio/xdgmime/xdgmimealias.h index 3c28012dc..06fc0c338 100644 --- a/gio/xdgmime/xdgmimealias.h +++ b/gio/xdgmime/xdgmimealias.h @@ -46,6 +46,7 @@ XdgAliasList *_xdg_mime_alias_list_new (void); void _xdg_mime_alias_list_free (XdgAliasList *list); const char *_xdg_mime_alias_list_lookup (XdgAliasList *list, const char *alias); +#ifdef NOT_USED_IN_GIO void _xdg_mime_alias_list_dump (XdgAliasList *list); - +#endif #endif /* __XDG_MIME_ALIAS_H__ */ diff --git a/gio/xdgmime/xdgmimecache.c b/gio/xdgmime/xdgmimecache.c index 58a845b15..a6975a107 100644 --- a/gio/xdgmime/xdgmimecache.c +++ b/gio/xdgmime/xdgmimecache.c @@ -738,6 +738,8 @@ _xdg_mime_cache_get_mime_type_for_data (const void *data, return cache_get_mime_type_for_data (data, len, result_prio, NULL, 0); } +#ifdef NOT_USED_IN_GIO + const char * _xdg_mime_cache_get_mime_type_for_file (const char *file_name, struct stat *statbuf) @@ -824,6 +826,8 @@ _xdg_mime_cache_get_mime_type_from_file_name (const char *file_name) return XDG_MIME_TYPE_UNKNOWN; } +#endif + int _xdg_mime_cache_get_mime_types_from_file_name (const char *file_name, const char *mime_types[], @@ -1052,6 +1056,8 @@ _xdg_mime_cache_get_icon (const char *mime) return cache_lookup_icon (mime, 32); } +#ifdef NOT_USED_IN_GIO + static void dump_glob_node (XdgMimeCache *cache, xdg_uint32_t offset, @@ -1099,4 +1105,4 @@ _xdg_mime_cache_glob_dump (void) } } - +#endif diff --git a/gio/xdgmime/xdgmimecache.h b/gio/xdgmime/xdgmimecache.h index 27f42d0ca..48756adea 100644 --- a/gio/xdgmime/xdgmimecache.h +++ b/gio/xdgmime/xdgmimecache.h @@ -58,12 +58,16 @@ void _xdg_mime_cache_unref (XdgMimeCache *cache); const char *_xdg_mime_cache_get_mime_type_for_data (const void *data, size_t len, int *result_prio); +#ifdef NOT_USED_IN_GIO const char *_xdg_mime_cache_get_mime_type_for_file (const char *file_name, struct stat *statbuf); +#endif int _xdg_mime_cache_get_mime_types_from_file_name (const char *file_name, const char *mime_types[], int n_mime_types); +#ifdef NOT_USED_IN_GIO const char *_xdg_mime_cache_get_mime_type_from_file_name (const char *file_name); +#endif int _xdg_mime_cache_is_valid_mime_type (const char *mime_type); int _xdg_mime_cache_mime_type_equal (const char *mime_a, const char *mime_b); @@ -76,6 +80,8 @@ const char *_xdg_mime_cache_unalias_mime_type (const char *mime); int _xdg_mime_cache_get_max_buffer_extents (void); const char *_xdg_mime_cache_get_icon (const char *mime); const char *_xdg_mime_cache_get_generic_icon (const char *mime); +#ifdef NOT_USED_IN_GIO void _xdg_mime_cache_glob_dump (void); +#endif #endif /* __XDG_MIME_CACHE_H__ */ diff --git a/gio/xdgmime/xdgmimeglob.c b/gio/xdgmime/xdgmimeglob.c index 6463837db..6e1befa05 100644 --- a/gio/xdgmime/xdgmimeglob.c +++ b/gio/xdgmime/xdgmimeglob.c @@ -162,6 +162,8 @@ _xdg_glob_hash_node_new (void) return glob_hash_node; } +#ifdef NOT_USED_IN_GIO + static void _xdg_glob_hash_node_dump (XdgGlobHashNode *glob_hash_node, int depth) @@ -181,6 +183,8 @@ _xdg_glob_hash_node_dump (XdgGlobHashNode *glob_hash_node, _xdg_glob_hash_node_dump (glob_hash_node->next, depth); } +#endif + static XdgGlobHashNode * _xdg_glob_hash_insert_ucs4 (XdgGlobHashNode *glob_hash_node, xdg_unichar_t *text, @@ -603,6 +607,8 @@ _xdg_glob_hash_append_glob (XdgGlobHash *glob_hash, } } +#ifdef NOT_USED_IN_GIO + void _xdg_glob_hash_dump (XdgGlobHash *glob_hash) { @@ -639,6 +645,7 @@ _xdg_glob_hash_dump (XdgGlobHash *glob_hash) } } +#endif void _xdg_mime_glob_read_from_file (XdgGlobHash *glob_hash, diff --git a/gio/xdgmime/xdgmimeglob.h b/gio/xdgmime/xdgmimeglob.h index 00182920d..d82643418 100644 --- a/gio/xdgmime/xdgmimeglob.h +++ b/gio/xdgmime/xdgmimeglob.h @@ -65,6 +65,8 @@ void _xdg_glob_hash_append_glob (XdgGlobHash *glob_hash, int weight, int case_sensitive); XdgGlobType _xdg_glob_determine_type (const char *glob); +#ifdef NOT_USED_IN_GIO void _xdg_glob_hash_dump (XdgGlobHash *glob_hash); +#endif #endif /* __XDG_MIME_GLOB_H__ */ diff --git a/gio/xdgmime/xdgmimeicon.c b/gio/xdgmime/xdgmimeicon.c index 05c9473a6..d22bade4a 100644 --- a/gio/xdgmime/xdgmimeicon.c +++ b/gio/xdgmime/xdgmimeicon.c @@ -163,6 +163,7 @@ _xdg_mime_icon_read_from_file (XdgIconList *list, sizeof (XdgIcon), icon_entry_cmp); } +#ifdef NOT_USED_IN_GIO void _xdg_mime_icon_list_dump (XdgIconList *list) @@ -180,4 +181,5 @@ _xdg_mime_icon_list_dump (XdgIconList *list) } } +#endif diff --git a/gio/xdgmime/xdgmimeicon.h b/gio/xdgmime/xdgmimeicon.h index b5f25835d..4f604c1ea 100644 --- a/gio/xdgmime/xdgmimeicon.h +++ b/gio/xdgmime/xdgmimeicon.h @@ -45,6 +45,8 @@ XdgIconList *_xdg_mime_icon_list_new (void); void _xdg_mime_icon_list_free (XdgIconList *list); const char *_xdg_mime_icon_list_lookup (XdgIconList *list, const char *mime); +#ifdef NOT_USED_IN_GIO void _xdg_mime_icon_list_dump (XdgIconList *list); +#endif #endif /* __XDG_MIME_ICON_H__ */ diff --git a/gio/xdgmime/xdgmimeparent.c b/gio/xdgmime/xdgmimeparent.c index 511bbacbc..27d910b1b 100644 --- a/gio/xdgmime/xdgmimeparent.c +++ b/gio/xdgmime/xdgmimeparent.c @@ -199,6 +199,7 @@ _xdg_mime_parent_read_from_file (XdgParentList *list, sizeof (XdgMimeParents), &parent_entry_cmp); } +#ifdef NOT_USED_IN_GIO void _xdg_mime_parent_list_dump (XdgParentList *list) @@ -216,4 +217,5 @@ _xdg_mime_parent_list_dump (XdgParentList *list) } } +#endif diff --git a/gio/xdgmime/xdgmimeparent.h b/gio/xdgmime/xdgmimeparent.h index b564f4127..fbc927e89 100644 --- a/gio/xdgmime/xdgmimeparent.h +++ b/gio/xdgmime/xdgmimeparent.h @@ -46,6 +46,8 @@ XdgParentList *_xdg_mime_parent_list_new (void); void _xdg_mime_parent_list_free (XdgParentList *list); const char **_xdg_mime_parent_list_lookup (XdgParentList *list, const char *mime); +#ifdef NOT_USED_IN_GIO void _xdg_mime_parent_list_dump (XdgParentList *list); +#endif #endif /* __XDG_MIME_PARENT_H__ */