[glib: 3/7] Rename all visibility macros
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 3/7] Rename all visibility macros
- Date: Fri, 14 Oct 2022 11:47:46 +0000 (UTC)
commit e5565f6635fdae5d0fb23843eb8adc01bbb45e6c
Author: Xavier Claessens <xavier claessens collabora com>
Date: Wed Oct 5 13:39:21 2022 -0400
Rename all visibility macros
gio/gaction.h | 24 ++--
gio/gactiongroup.h | 30 ++--
gio/gactiongroupexporter.h | 4 +-
gio/gactionmap.h | 10 +-
gio/gappinfo.h | 102 +++++++-------
gio/gapplication.h | 76 +++++-----
gio/gapplicationcommandline.h | 28 ++--
gio/gasyncinitable.h | 14 +-
gio/gasyncresult.h | 10 +-
gio/gbufferedinputstream.h | 24 ++--
gio/gbufferedoutputstream.h | 14 +-
gio/gbytesicon.h | 6 +-
gio/gcancellable.h | 30 ++--
gio/gcharsetconverter.h | 10 +-
gio/gcontenttype.h | 32 ++---
gio/gconverter.h | 6 +-
gio/gconverterinputstream.h | 6 +-
gio/gconverteroutputstream.h | 6 +-
gio/gcredentials.h | 18 +--
gio/gdatagrambased.h | 12 +-
gio/gdatainputstream.h | 48 +++----
gio/gdataoutputstream.h | 24 ++--
gio/gdbusactiongroup.h | 4 +-
gio/gdbusaddress.h | 14 +-
gio/gdbusauthobserver.h | 8 +-
gio/gdbusconnection.h | 94 ++++++-------
gio/gdbuserror.h | 22 +--
gio/gdbusinterface.h | 10 +-
gio/gdbusinterfaceskeleton.h | 28 ++--
gio/gdbusintrospection.h | 62 ++++-----
gio/gdbusmenumodel.h | 4 +-
gio/gdbusmessage.h | 100 +++++++-------
gio/gdbusmethodinvocation.h | 42 +++---
gio/gdbusnameowning.h | 10 +-
gio/gdbusnamewatching.h | 10 +-
gio/gdbusobject.h | 8 +-
gio/gdbusobjectmanager.h | 10 +-
gio/gdbusobjectmanagerclient.h | 22 +--
gio/gdbusobjectmanagerserver.h | 16 +--
gio/gdbusobjectproxy.h | 6 +-
gio/gdbusobjectskeleton.h | 14 +-
gio/gdbusprivate.h | 2 +-
gio/gdbusproxy.h | 52 +++----
gio/gdbusserver.h | 16 +--
gio/gdbusutils.h | 24 ++--
gio/gdebugcontroller.h | 6 +-
gio/gdebugcontrollerdbus.h | 6 +-
gio/gdesktopappinfo.h | 64 ++++-----
gio/gdrive.h | 58 ++++----
gio/gdtlsclientconnection.h | 14 +-
gio/gdtlsconnection.h | 56 ++++----
gio/gdtlsserverconnection.h | 4 +-
gio/gemblem.h | 10 +-
gio/gemblemedicon.h | 12 +-
gio/gfile.h | 282 +++++++++++++++++++-------------------
gio/gfileattribute.h | 14 +-
gio/gfiledescriptorbased.h | 4 +-
gio/gfileenumerator.h | 26 ++--
gio/gfileicon.h | 6 +-
gio/gfileinfo.h | 160 ++++++++++-----------
gio/gfileinputstream.h | 8 +-
gio/gfileiostream.h | 10 +-
gio/gfilemonitor.h | 10 +-
gio/gfilenamecompleter.h | 10 +-
gio/gfileoutputstream.h | 10 +-
gio/gfilterinputstream.h | 8 +-
gio/gfilteroutputstream.h | 8 +-
gio/gicon.h | 14 +-
gio/ginetaddress.h | 40 +++---
gio/ginetaddressmask.h | 18 +--
gio/ginetsocketaddress.h | 14 +-
gio/ginitable.h | 10 +-
gio/ginputstream.h | 40 +++---
gio/gioenums.h | 24 ++--
gio/gioenumtypes.h.template | 2 +-
gio/gioerror.h | 8 +-
gio/giomodule.h | 46 +++----
gio/gioscheduler.h | 8 +-
gio/giostream.h | 24 ++--
gio/glistmodel.h | 12 +-
gio/gliststore.h | 24 ++--
gio/gloadableicon.h | 8 +-
gio/glocalfilemonitor.h | 4 +-
gio/gmemoryinputstream.h | 12 +-
gio/gmemorymonitor.h | 4 +-
gio/gmemoryoutputstream.h | 16 +--
gio/gmenu.h | 70 +++++-----
gio/gmenuexporter.h | 4 +-
gio/gmenumodel.h | 38 ++---
gio/gmount.h | 56 ++++----
gio/gmountoperation.h | 42 +++---
gio/gnativesocketaddress.h | 4 +-
gio/gnativevolumemonitor.h | 2 +-
gio/gnetworkaddress.h | 16 +--
gio/gnetworking.h.in | 2 +-
gio/gnetworkmonitor.h | 16 +--
gio/gnetworkmonitorbase.h | 8 +-
gio/gnetworkservice.h | 14 +-
gio/gnotification.h | 28 ++--
gio/gosxappinfo.h | 6 +-
gio/goutputstream.h | 64 ++++-----
gio/gpermission.h | 22 +--
gio/gpollableinputstream.h | 10 +-
gio/gpollableoutputstream.h | 12 +-
gio/gpollableutils.h | 10 +-
gio/gpowerprofilemonitor.h | 6 +-
gio/gpropertyaction.h | 4 +-
gio/gproxy.h | 12 +-
gio/gproxyaddress.h | 18 +--
gio/gproxyaddressenumerator.h | 2 +-
gio/gproxyresolver.h | 12 +-
gio/gremoteactiongroup.h | 6 +-
gio/gresolver.h | 42 +++---
gio/gresource.h | 38 ++---
gio/gseekable.h | 12 +-
gio/gsettings.h | 104 +++++++-------
gio/gsettingsbackend.h | 24 ++--
gio/gsettingsschema.h | 52 +++----
gio/gsimpleaction.h | 12 +-
gio/gsimpleactiongroup.h | 12 +-
gio/gsimpleasyncresult.h | 52 +++----
gio/gsimpleiostream.h | 4 +-
gio/gsimplepermission.h | 4 +-
gio/gsimpleproxyresolver.h | 10 +-
gio/gsocket.h | 116 ++++++++--------
gio/gsocketaddress.h | 10 +-
gio/gsocketaddressenumerator.h | 8 +-
gio/gsocketclient.h | 66 ++++-----
gio/gsocketconnectable.h | 8 +-
gio/gsocketconnection.h | 22 +--
gio/gsocketcontrolmessage.h | 12 +-
gio/gsocketlistener.h | 28 ++--
gio/gsocketservice.h | 10 +-
gio/gsrvtarget.h | 18 +--
gio/gsubprocess.h | 54 ++++----
gio/gsubprocesslauncher.h | 38 ++---
gio/gtask.h | 72 +++++-----
gio/gtcpconnection.h | 6 +-
gio/gtcpwrapperconnection.h | 6 +-
gio/gtestdbus.h | 18 +--
gio/gthemedicon.h | 14 +-
gio/gthreadedresolver.h | 6 +-
gio/gthreadedsocketservice.h | 4 +-
gio/gtlsbackend.h | 24 ++--
gio/gtlscertificate.h | 34 ++---
gio/gtlsclientconnection.h | 20 +--
gio/gtlsconnection.h | 52 +++----
gio/gtlsdatabase.h | 28 ++--
gio/gtlsfiledatabase.h | 4 +-
gio/gtlsinteraction.h | 18 +--
gio/gtlspassword.h | 22 +--
gio/gtlsserverconnection.h | 4 +-
gio/gunixconnection.h | 18 +--
gio/gunixcredentialsmessage.h | 10 +-
gio/gunixfdlist.h | 16 +--
gio/gunixfdmessage.h | 12 +-
gio/gunixinputstream.h | 10 +-
gio/gunixmounts.h | 90 ++++++------
gio/gunixoutputstream.h | 10 +-
gio/gunixsocketaddress.h | 18 +--
gio/gvfs.h | 20 +--
gio/gvolume.h | 42 +++---
gio/gvolumemonitor.h | 16 +--
gio/gwin32inputstream.h | 10 +-
gio/gwin32outputstream.h | 10 +-
gio/gwin32registrykey.h | 74 +++++-----
gio/gzlibcompressor.h | 8 +-
gio/gzlibdecompressor.h | 6 +-
gmodule/gmodule.c | 6 +-
gmodule/gmodule.h | 24 ++--
gobject/gbinding.h | 26 ++--
gobject/gbindinggroup.h | 14 +-
gobject/gboxed.h | 22 +--
gobject/gclosure.h | 36 ++---
gobject/genums.h | 38 ++---
gobject/glib-enumtypes.h.template | 2 +-
gobject/glib-types.h | 64 ++++-----
gobject/gmarshal.h | 88 ++++++------
gobject/gobject.h | 140 +++++++++----------
gobject/gparam.h | 74 +++++-----
gobject/gparamspecs.h | 52 +++----
gobject/gsignal.h | 84 ++++++------
gobject/gsignalgroup.h | 24 ++--
gobject/gsourceclosure.h | 4 +-
gobject/gtype.h | 150 ++++++++++----------
gobject/gtypemodule.h | 16 +--
gobject/gtypeplugin.h | 10 +-
gobject/gvalue.h | 26 ++--
gobject/gvaluearray.h | 24 ++--
gobject/gvaluetypes.h | 86 ++++++------
190 files changed, 2589 insertions(+), 2589 deletions(-)
---
diff --git a/gio/gaction.h b/gio/gaction.h
index 988ddc3aa3..c3666b49db 100644
--- a/gio/gaction.h
+++ b/gio/gaction.h
@@ -58,40 +58,40 @@ struct _GActionInterface
GVariant *parameter);
};
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
GType g_action_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar * g_action_get_name (GAction *action);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const GVariantType * g_action_get_parameter_type (GAction *action);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const GVariantType * g_action_get_state_type (GAction *action);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant * g_action_get_state_hint (GAction *action);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_action_get_enabled (GAction *action);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant * g_action_get_state (GAction *action);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_change_state (GAction *action,
GVariant *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_activate (GAction *action,
GVariant *parameter);
-GLIB_AVAILABLE_IN_2_28
+GIO_AVAILABLE_IN_2_28
gboolean g_action_name_is_valid (const gchar *action_name);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
gboolean g_action_parse_detailed_name (const gchar *detailed_name,
gchar **action_name,
GVariant **target_value,
GError **error);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
gchar * g_action_print_detailed_name (const gchar *action_name,
GVariant *target_value);
diff --git a/gio/gactiongroup.h b/gio/gactiongroup.h
index e6b0c3f816..f8d20ae692 100644
--- a/gio/gactiongroup.h
+++ b/gio/gactiongroup.h
@@ -96,60 +96,60 @@ struct _GActionGroupInterface
GVariant **state);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_action_group_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_action_group_has_action (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar ** g_action_group_list_actions (GActionGroup *action_group);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const GVariantType * g_action_group_get_action_parameter_type (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const GVariantType * g_action_group_get_action_state_type (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant * g_action_group_get_action_state_hint (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_action_group_get_action_enabled (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant * g_action_group_get_action_state (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_group_change_action_state (GActionGroup *action_group,
const gchar *action_name,
GVariant *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_group_activate_action (GActionGroup *action_group,
const gchar *action_name,
GVariant *parameter);
/* signals */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_group_action_added (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_group_action_removed (GActionGroup *action_group,
const gchar *action_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_group_action_enabled_changed (GActionGroup *action_group,
const gchar *action_name,
gboolean enabled);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_action_group_action_state_changed (GActionGroup *action_group,
const gchar *action_name,
GVariant *state);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_action_group_query_action (GActionGroup *action_group,
const gchar *action_name,
gboolean *enabled,
diff --git a/gio/gactiongroupexporter.h b/gio/gactiongroupexporter.h
index 365e5a1a3d..52f40af2b3 100644
--- a/gio/gactiongroupexporter.h
+++ b/gio/gactiongroupexporter.h
@@ -32,13 +32,13 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint g_dbus_connection_export_action_group (GDBusConnection *connection,
const gchar *object_path,
GActionGroup *action_group,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_dbus_connection_unexport_action_group (GDBusConnection *connection,
guint export_id);
diff --git a/gio/gactionmap.h b/gio/gactionmap.h
index 6a4e8263c2..28a5773295 100644
--- a/gio/gactionmap.h
+++ b/gio/gactionmap.h
@@ -74,19 +74,19 @@ struct _GActionEntry
gsize padding[3];
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_action_map_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GAction * g_action_map_lookup_action (GActionMap *action_map,
const gchar *action_name);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_action_map_add_action (GActionMap *action_map,
GAction *action);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_action_map_remove_action (GActionMap *action_map,
const gchar *action_name);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_action_map_add_action_entries (GActionMap *action_map,
const GActionEntry *entries,
gint n_entries,
diff --git a/gio/gappinfo.h b/gio/gappinfo.h
index 84162f0e23..6b13596b25 100644
--- a/gio/gappinfo.h
+++ b/gio/gappinfo.h
@@ -146,139 +146,139 @@ struct _GAppInfoIface
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_app_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GAppInfo * g_app_info_create_from_commandline (const char *commandline,
const char *application_name,
GAppInfoCreateFlags flags,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GAppInfo * g_app_info_dup (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_equal (GAppInfo *appinfo1,
GAppInfo *appinfo2);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char *g_app_info_get_id (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char *g_app_info_get_name (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char *g_app_info_get_display_name (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char *g_app_info_get_description (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char *g_app_info_get_executable (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char *g_app_info_get_commandline (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_app_info_get_icon (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_launch (GAppInfo *appinfo,
GList *files,
GAppLaunchContext *context,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_supports_uris (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_supports_files (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_launch_uris (GAppInfo *appinfo,
GList *uris,
GAppLaunchContext *context,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_app_info_launch_uris_async (GAppInfo *appinfo,
GList *uris,
GAppLaunchContext *context,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
gboolean g_app_info_launch_uris_finish (GAppInfo *appinfo,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_should_show (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_set_as_default_for_type (GAppInfo *appinfo,
const char *content_type,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_set_as_default_for_extension (GAppInfo *appinfo,
const char *extension,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_add_supports_type (GAppInfo *appinfo,
const char *content_type,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_can_remove_supports_type (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_remove_supports_type (GAppInfo *appinfo,
const char *content_type,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
const char **g_app_info_get_supported_types (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_can_delete (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_delete (GAppInfo *appinfo);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_set_as_last_used_for_type (GAppInfo *appinfo,
const char *content_type,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_app_info_get_all (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_app_info_get_all_for_type (const char *content_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_app_info_get_recommended_for_type (const gchar *content_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_app_info_get_fallback_for_type (const gchar *content_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_app_info_reset_type_associations (const char *content_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GAppInfo *g_app_info_get_default_for_type (const char *content_type,
gboolean must_support_uris);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
void g_app_info_get_default_for_type_async (const char *content_type,
gboolean must_support_uris,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
GAppInfo *g_app_info_get_default_for_type_finish (GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GAppInfo *g_app_info_get_default_for_uri_scheme (const char *uri_scheme);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
void g_app_info_get_default_for_uri_scheme_async (const char *uri_scheme,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
GAppInfo *g_app_info_get_default_for_uri_scheme_finish (GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_app_info_launch_default_for_uri (const char *uri,
GAppLaunchContext *context,
GError **error);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
void g_app_info_launch_default_for_uri_async (const char *uri,
GAppLaunchContext *context,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
gboolean g_app_info_launch_default_for_uri_finish (GAsyncResult *result,
GError **error);
@@ -323,30 +323,30 @@ struct _GAppLaunchContextClass
void (*_g_reserved3) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_app_launch_context_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GAppLaunchContext *g_app_launch_context_new (void);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_app_launch_context_setenv (GAppLaunchContext *context,
const char *variable,
const char *value);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_app_launch_context_unsetenv (GAppLaunchContext *context,
const char *variable);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
char ** g_app_launch_context_get_environment (GAppLaunchContext *context);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_app_launch_context_get_display (GAppLaunchContext *context,
GAppInfo *info,
GList *files);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
GAppInfo *info,
GList *files);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_app_launch_context_launch_failed (GAppLaunchContext *context,
const char * startup_notify_id);
@@ -358,10 +358,10 @@ void g_app_launch_context_launch_failed (GAppLaunchContext
typedef struct _GAppInfoMonitor GAppInfoMonitor;
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GType g_app_info_monitor_get_type (void);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GAppInfoMonitor * g_app_info_monitor_get (void);
G_END_DECLS
diff --git a/gio/gapplication.h b/gio/gapplication.h
index 345405366b..083ac95df8 100644
--- a/gio/gapplication.h
+++ b/gio/gapplication.h
@@ -120,54 +120,54 @@ struct _GApplicationClass
gpointer padding[7];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_application_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_application_id_is_valid (const gchar
*application_id);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GApplication * g_application_new (const gchar
*application_id,
GApplicationFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar * g_application_get_application_id (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_set_application_id (GApplication
*application,
const gchar
*application_id);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GDBusConnection * g_application_get_dbus_connection (GApplication
*application);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
const gchar * g_application_get_dbus_object_path (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_application_get_inactivity_timeout (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_set_inactivity_timeout (GApplication
*application,
guint
inactivity_timeout);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GApplicationFlags g_application_get_flags (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_set_flags (GApplication
*application,
GApplicationFlags flags);
-GLIB_AVAILABLE_IN_2_42
+GIO_AVAILABLE_IN_2_42
const gchar * g_application_get_resource_base_path (GApplication
*application);
-GLIB_AVAILABLE_IN_2_42
+GIO_AVAILABLE_IN_2_42
void g_application_set_resource_base_path (GApplication
*application,
const gchar
*resource_path);
-GLIB_DEPRECATED
+GIO_DEPRECATED
void g_application_set_action_group (GApplication
*application,
GActionGroup
*action_group);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_application_add_main_option_entries (GApplication
*application,
const GOptionEntry *entries);
-GLIB_AVAILABLE_IN_2_42
+GIO_AVAILABLE_IN_2_42
void g_application_add_main_option (GApplication
*application,
const char *long_name,
char
short_name,
@@ -175,76 +175,76 @@ void g_application_add_main_option (GApplic
GOptionArg arg,
const char
*description,
const char
*arg_description);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_application_add_option_group (GApplication
*application,
GOptionGroup *group);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
void g_application_set_option_context_parameter_string (GApplication
*application,
const gchar
*parameter_string);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
void g_application_set_option_context_summary (GApplication
*application,
const gchar *summary);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
void g_application_set_option_context_description (GApplication
*application,
const gchar
*description);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_application_get_is_registered (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_application_get_is_remote (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_application_register (GApplication
*application,
GCancellable
*cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_hold (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_release (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_activate (GApplication
*application);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_open (GApplication
*application,
GFile **files,
gint n_files,
const gchar *hint);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_application_run (GApplication
*application,
int argc,
char **argv);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_application_quit (GApplication
*application);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GApplication * g_application_get_default (void);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_application_set_default (GApplication
*application);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_application_mark_busy (GApplication
*application);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_application_unmark_busy (GApplication
*application);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gboolean g_application_get_is_busy (GApplication
*application);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_application_send_notification (GApplication
*application,
const gchar *id,
GNotification
*notification);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_application_withdraw_notification (GApplication
*application,
const gchar *id);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_application_bind_busy_property (GApplication
*application,
gpointer object,
const gchar *property);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_application_unbind_busy_property (GApplication
*application,
gpointer object,
const gchar *property);
diff --git a/gio/gapplicationcommandline.h b/gio/gapplicationcommandline.h
index a22a2b5fd5..abb68526fb 100644
--- a/gio/gapplicationcommandline.h
+++ b/gio/gapplicationcommandline.h
@@ -71,51 +71,51 @@ struct _GApplicationCommandLineClass
gpointer padding[11];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_application_command_line_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar ** g_application_command_line_get_arguments (GApplicationCommandLine *cmdline,
int *argc);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GVariantDict * g_application_command_line_get_options_dict (GApplicationCommandLine *cmdline);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GInputStream * g_application_command_line_get_stdin (GApplicationCommandLine *cmdline);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar * const * g_application_command_line_get_environ (GApplicationCommandLine *cmdline);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar * g_application_command_line_getenv (GApplicationCommandLine *cmdline,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar * g_application_command_line_get_cwd (GApplicationCommandLine *cmdline);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_application_command_line_get_is_remote (GApplicationCommandLine *cmdline);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_command_line_print (GApplicationCommandLine *cmdline,
const gchar *format,
...) G_GNUC_PRINTF(2, 3);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_command_line_printerr (GApplicationCommandLine *cmdline,
const gchar *format,
...) G_GNUC_PRINTF(2, 3);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_application_command_line_get_exit_status (GApplicationCommandLine *cmdline);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_application_command_line_set_exit_status (GApplicationCommandLine *cmdline,
int
exit_status);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant * g_application_command_line_get_platform_data (GApplicationCommandLine *cmdline);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GFile * g_application_command_line_create_file_for_arg (GApplicationCommandLine *cmdline,
const gchar *arg);
diff --git a/gio/gasyncinitable.h b/gio/gasyncinitable.h
index 225702c6ed..18083982ec 100644
--- a/gio/gasyncinitable.h
+++ b/gio/gasyncinitable.h
@@ -74,22 +74,22 @@ struct _GAsyncInitableIface
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_async_initable_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_async_initable_init_async (GAsyncInitable *initable,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_async_initable_init_finish (GAsyncInitable *initable,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_async_initable_new_async (GType object_type,
int io_priority,
GCancellable *cancellable,
@@ -100,7 +100,7 @@ void g_async_initable_new_async (GType object_type,
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_async_initable_init_async)
+GIO_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_async_initable_init_async)
void g_async_initable_newv_async (GType object_type,
guint n_parameters,
GParameter *parameters,
@@ -111,7 +111,7 @@ void g_async_initable_newv_async (GType object_type,
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_async_initable_new_valist_async (GType object_type,
const gchar *first_property_name,
va_list var_args,
@@ -119,7 +119,7 @@ void g_async_initable_new_valist_async (GType object_type,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GObject *g_async_initable_new_finish (GAsyncInitable *initable,
GAsyncResult *res,
GError **error);
diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h
index c352c798ac..4a98c5f443 100644
--- a/gio/gasyncresult.h
+++ b/gio/gasyncresult.h
@@ -67,18 +67,18 @@ struct _GAsyncResultIface
gpointer source_tag);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_async_result_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gpointer g_async_result_get_user_data (GAsyncResult *res);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GObject *g_async_result_get_source_object (GAsyncResult *res);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gboolean g_async_result_legacy_propagate_error (GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gboolean g_async_result_is_tagged (GAsyncResult *res,
gpointer source_tag);
diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h
index ca7b0f9b1c..c6b1deadc8 100644
--- a/gio/gbufferedinputstream.h
+++ b/gio/gbufferedinputstream.h
@@ -84,48 +84,48 @@ struct _GBufferedInputStreamClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_buffered_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream* g_buffered_input_stream_new (GInputStream *base_stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream* g_buffered_input_stream_new_sized (GInputStream *base_stream,
gsize size);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_buffered_input_stream_get_buffer_size (GBufferedInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_buffered_input_stream_set_buffer_size (GBufferedInputStream *stream,
gsize size);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_buffered_input_stream_get_available (GBufferedInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_buffered_input_stream_peek (GBufferedInputStream *stream,
void *buffer,
gsize offset,
gsize count);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const void* g_buffered_input_stream_peek_buffer (GBufferedInputStream *stream,
gsize *count);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_buffered_input_stream_fill (GBufferedInputStream *stream,
gssize count,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_buffered_input_stream_fill_async (GBufferedInputStream *stream,
gssize count,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_buffered_input_stream_fill_finish (GBufferedInputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_buffered_input_stream_read_byte (GBufferedInputStream *stream,
GCancellable *cancellable,
GError **error);
diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h
index a50d5e7b30..1259c76fb9 100644
--- a/gio/gbufferedoutputstream.h
+++ b/gio/gbufferedoutputstream.h
@@ -65,21 +65,21 @@ struct _GBufferedOutputStreamClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_buffered_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream* g_buffered_output_stream_new (GOutputStream *base_stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream* g_buffered_output_stream_new_sized (GOutputStream *base_stream,
gsize size);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_buffered_output_stream_get_buffer_size (GBufferedOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_buffered_output_stream_set_buffer_size (GBufferedOutputStream *stream,
gsize size);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_buffered_output_stream_get_auto_grow (GBufferedOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_buffered_output_stream_set_auto_grow (GBufferedOutputStream *stream,
gboolean auto_grow);
diff --git a/gio/gbytesicon.h b/gio/gbytesicon.h
index 668f85f507..c917d3816f 100644
--- a/gio/gbytesicon.h
+++ b/gio/gbytesicon.h
@@ -40,13 +40,13 @@ G_BEGIN_DECLS
*
* Gets an icon for a #GBytes. Implements #GLoadableIcon.
**/
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
GType g_bytes_icon_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
GIcon * g_bytes_icon_new (GBytes *bytes);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
GBytes * g_bytes_icon_get_bytes (GBytesIcon *icon);
G_END_DECLS
diff --git a/gio/gcancellable.h b/gio/gcancellable.h
index 790a59bad1..d33215db35 100644
--- a/gio/gcancellable.h
+++ b/gio/gcancellable.h
@@ -69,50 +69,50 @@ struct _GCancellableClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_cancellable_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCancellable *g_cancellable_new (void);
/* These are only safe to call inside a cancellable op */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_cancellable_is_cancelled (GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_cancellable_set_error_if_cancelled (GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_cancellable_get_fd (GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_cancellable_make_pollfd (GCancellable *cancellable,
GPollFD *pollfd);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_cancellable_release_fd (GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSource * g_cancellable_source_new (GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCancellable *g_cancellable_get_current (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_cancellable_push_current (GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_cancellable_pop_current (GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_cancellable_reset (GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gulong g_cancellable_connect (GCancellable *cancellable,
GCallback callback,
gpointer data,
GDestroyNotify data_destroy_func);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_cancellable_disconnect (GCancellable *cancellable,
gulong handler_id);
/* This is safe to call from another thread */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_cancellable_cancel (GCancellable *cancellable);
G_END_DECLS
diff --git a/gio/gcharsetconverter.h b/gio/gcharsetconverter.h
index 5ab8f32d6f..455ca7cb55 100644
--- a/gio/gcharsetconverter.h
+++ b/gio/gcharsetconverter.h
@@ -45,19 +45,19 @@ struct _GCharsetConverterClass
GObjectClass parent_class;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_charset_converter_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCharsetConverter *g_charset_converter_new (const gchar *to_charset,
const gchar *from_charset,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_charset_converter_set_use_fallback (GCharsetConverter *converter,
gboolean use_fallback);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_charset_converter_get_use_fallback (GCharsetConverter *converter);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_charset_converter_get_num_fallbacks (GCharsetConverter *converter);
G_END_DECLS
diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h
index bd487f1c76..910c2e2410 100644
--- a/gio/gcontenttype.h
+++ b/gio/gcontenttype.h
@@ -31,51 +31,51 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_content_type_equals (const gchar *type1,
const gchar *type2);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_content_type_is_a (const gchar *type,
const gchar *supertype);
-GLIB_AVAILABLE_IN_2_52
+GIO_AVAILABLE_IN_2_52
gboolean g_content_type_is_mime_type (const gchar *type,
const gchar *mime_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_content_type_is_unknown (const gchar *type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar * g_content_type_get_description (const gchar *type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar * g_content_type_get_mime_type (const gchar *type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_content_type_get_icon (const gchar *type);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GIcon * g_content_type_get_symbolic_icon (const gchar *type);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gchar * g_content_type_get_generic_icon_name (const gchar *type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_content_type_can_be_executable (const gchar *type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar * g_content_type_from_mime_type (const gchar *mime_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar * g_content_type_guess (const gchar *filename,
const guchar *data,
gsize data_size,
gboolean *result_uncertain);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar ** g_content_type_guess_for_tree (GFile *root);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_content_types_get_registered (void);
/*< private >*/
#ifndef __GTK_DOC_IGNORE__
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
const gchar * const *g_content_type_get_mime_dirs (void);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_content_type_set_mime_dirs (const gchar * const *dirs);
#endif /* __GTK_DOC_IGNORE__ */
diff --git a/gio/gconverter.h b/gio/gconverter.h
index a39a765473..16e94a1bd0 100644
--- a/gio/gconverter.h
+++ b/gio/gconverter.h
@@ -75,10 +75,10 @@ struct _GConverterIface
void (* reset) (GConverter *converter);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_converter_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GConverterResult g_converter_convert (GConverter *converter,
const void *inbuf,
gsize inbuf_size,
@@ -88,7 +88,7 @@ GConverterResult g_converter_convert (GConverter *converter,
gsize *bytes_read,
gsize *bytes_written,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_converter_reset (GConverter *converter);
diff --git a/gio/gconverterinputstream.h b/gio/gconverterinputstream.h
index 2747fdb9ff..01de11ed30 100644
--- a/gio/gconverterinputstream.h
+++ b/gio/gconverterinputstream.h
@@ -69,12 +69,12 @@ struct _GConverterInputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_converter_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream *g_converter_input_stream_new (GInputStream *base_stream,
GConverter *converter);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GConverter *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
G_END_DECLS
diff --git a/gio/gconverteroutputstream.h b/gio/gconverteroutputstream.h
index d6a960b5ce..c09084606c 100644
--- a/gio/gconverteroutputstream.h
+++ b/gio/gconverteroutputstream.h
@@ -69,12 +69,12 @@ struct _GConverterOutputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_converter_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream *g_converter_output_stream_new (GOutputStream *base_stream,
GConverter *converter);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GConverter *g_converter_output_stream_get_converter (GConverterOutputStream *converter_stream);
G_END_DECLS
diff --git a/gio/gcredentials.h b/gio/gcredentials.h
index 60b3abaf2e..c30f31fc1a 100644
--- a/gio/gcredentials.h
+++ b/gio/gcredentials.h
@@ -46,37 +46,37 @@ G_BEGIN_DECLS
typedef struct _GCredentialsClass GCredentialsClass;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_credentials_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCredentials *g_credentials_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_credentials_to_string (GCredentials *credentials);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gpointer g_credentials_get_native (GCredentials *credentials,
GCredentialsType native_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_credentials_set_native (GCredentials *credentials,
GCredentialsType native_type,
gpointer native);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_credentials_is_same_user (GCredentials *credentials,
GCredentials *other_credentials,
GError **error);
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
pid_t g_credentials_get_unix_pid (GCredentials *credentials,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
uid_t g_credentials_get_unix_user (GCredentials *credentials,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_credentials_set_unix_user (GCredentials *credentials,
uid_t uid,
GError **error);
diff --git a/gio/gdatagrambased.h b/gio/gdatagrambased.h
index 798e003b54..585728c3f0 100644
--- a/gio/gdatagrambased.h
+++ b/gio/gdatagrambased.h
@@ -100,11 +100,11 @@ struct _GDatagramBasedInterface
GError **error);
};
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GType
g_datagram_based_get_type (void);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gint
g_datagram_based_receive_messages (GDatagramBased *datagram_based,
GInputMessage *messages,
@@ -114,7 +114,7 @@ g_datagram_based_receive_messages (GDatagramBased *datagram_based,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gint
g_datagram_based_send_messages (GDatagramBased *datagram_based,
GOutputMessage *messages,
@@ -124,16 +124,16 @@ g_datagram_based_send_messages (GDatagramBased *datagram_based,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GSource *
g_datagram_based_create_source (GDatagramBased *datagram_based,
GIOCondition condition,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GIOCondition
g_datagram_based_condition_check (GDatagramBased *datagram_based,
GIOCondition condition);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean
g_datagram_based_condition_wait (GDatagramBased *datagram_based,
GIOCondition condition,
diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h
index 4380f06c56..e130295536 100644
--- a/gio/gdatainputstream.h
+++ b/gio/gdatainputstream.h
@@ -68,102 +68,102 @@ struct _GDataInputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_data_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDataInputStream * g_data_input_stream_new (GInputStream *base_stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_data_input_stream_set_byte_order (GDataInputStream *stream,
GDataStreamByteOrder order);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDataStreamByteOrder g_data_input_stream_get_byte_order (GDataInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_data_input_stream_set_newline_type (GDataInputStream *stream,
GDataStreamNewlineType type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guchar g_data_input_stream_read_byte (GDataInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint16 g_data_input_stream_read_int16 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_data_input_stream_read_uint16 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint32 g_data_input_stream_read_int32 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint32 g_data_input_stream_read_uint32 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint64 g_data_input_stream_read_int64 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint64 g_data_input_stream_read_uint64 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_data_input_stream_read_line (GDataInputStream *stream,
gsize *length,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
char * g_data_input_stream_read_line_utf8 (GDataInputStream *stream,
gsize *length,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_data_input_stream_read_line_async (GDataInputStream *stream,
gint io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_data_input_stream_read_line_finish (GDataInputStream *stream,
GAsyncResult *result,
gsize *length,
GError **error);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
char * g_data_input_stream_read_line_finish_utf8(GDataInputStream *stream,
GAsyncResult *result,
gsize *length,
GError **error);
-GLIB_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto)
+GIO_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto)
char * g_data_input_stream_read_until (GDataInputStream *stream,
const gchar *stop_chars,
gsize *length,
GCancellable *cancellable,
GError **error);
-GLIB_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_async)
+GIO_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_async)
void g_data_input_stream_read_until_async (GDataInputStream *stream,
const gchar *stop_chars,
gint io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_finish)
+GIO_DEPRECATED_IN_2_56_FOR (g_data_input_stream_read_upto_finish)
char * g_data_input_stream_read_until_finish (GDataInputStream *stream,
GAsyncResult *result,
gsize *length,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_data_input_stream_read_upto (GDataInputStream *stream,
const gchar *stop_chars,
gssize stop_chars_len,
gsize *length,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_data_input_stream_read_upto_async (GDataInputStream *stream,
const gchar *stop_chars,
gssize stop_chars_len,
@@ -171,7 +171,7 @@ void g_data_input_stream_read_upto_async (GDataInputStrea
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_data_input_stream_read_upto_finish (GDataInputStream *stream,
GAsyncResult *result,
gsize *length,
diff --git a/gio/gdataoutputstream.h b/gio/gdataoutputstream.h
index 046550c352..a8d434a404 100644
--- a/gio/gdataoutputstream.h
+++ b/gio/gdataoutputstream.h
@@ -70,53 +70,53 @@ struct _GDataOutputStreamClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_data_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDataOutputStream * g_data_output_stream_new (GOutputStream *base_stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_data_output_stream_set_byte_order (GDataOutputStream *stream,
GDataStreamByteOrder order);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_byte (GDataOutputStream *stream,
guchar data,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_int16 (GDataOutputStream *stream,
gint16 data,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_uint16 (GDataOutputStream *stream,
guint16 data,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_int32 (GDataOutputStream *stream,
gint32 data,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_uint32 (GDataOutputStream *stream,
guint32 data,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_int64 (GDataOutputStream *stream,
gint64 data,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_uint64 (GDataOutputStream *stream,
guint64 data,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_string (GDataOutputStream *stream,
const char *str,
GCancellable *cancellable,
diff --git a/gio/gdbusactiongroup.h b/gio/gdbusactiongroup.h
index 1575ffb2c8..84868f07ec 100644
--- a/gio/gdbusactiongroup.h
+++ b/gio/gdbusactiongroup.h
@@ -43,10 +43,10 @@ G_BEGIN_DECLS
#define G_DBUS_ACTION_GROUP_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst),
\
G_TYPE_DBUS_ACTION_GROUP,
GDBusActionGroupClass))
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_action_group_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GDBusActionGroup * g_dbus_action_group_get (GDBusConnection *connection,
const gchar *bus_name,
const gchar *object_path);
diff --git a/gio/gdbusaddress.h b/gio/gdbusaddress.h
index cc99c59138..09734adef3 100644
--- a/gio/gdbusaddress.h
+++ b/gio/gdbusaddress.h
@@ -31,33 +31,33 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gchar *g_dbus_address_escape_value (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_is_address (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_is_supported_address (const gchar *string,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_address_get_stream (const gchar *address,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream *g_dbus_address_get_stream_finish (GAsyncResult *res,
gchar **out_guid,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream *g_dbus_address_get_stream_sync (const gchar *address,
gchar **out_guid,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_dbus_address_get_for_bus_sync (GBusType bus_type,
GCancellable *cancellable,
GError **error);
diff --git a/gio/gdbusauthobserver.h b/gio/gdbusauthobserver.h
index 1961a337f6..715095d408 100644
--- a/gio/gdbusauthobserver.h
+++ b/gio/gdbusauthobserver.h
@@ -35,16 +35,16 @@ G_BEGIN_DECLS
#define G_DBUS_AUTH_OBSERVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_AUTH_OBSERVER,
GDBusAuthObserver))
#define G_IS_DBUS_AUTH_OBSERVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER))
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_auth_observer_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusAuthObserver *g_dbus_auth_observer_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_auth_observer_authorize_authenticated_peer (GDBusAuthObserver *observer,
GIOStream *stream,
GCredentials *credentials);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gboolean g_dbus_auth_observer_allow_mechanism (GDBusAuthObserver *observer,
const gchar *mechanism);
diff --git a/gio/gdbusconnection.h b/gio/gdbusconnection.h
index 5956251617..3a8cb9d272 100644
--- a/gio/gdbusconnection.h
+++ b/gio/gdbusconnection.h
@@ -35,27 +35,27 @@ G_BEGIN_DECLS
#define G_DBUS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_CONNECTION,
GDBusConnection))
#define G_IS_DBUS_CONNECTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION))
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_connection_get_type (void) G_GNUC_CONST;
/* ---------------------------------------------------------------------------------------------------- */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_bus_get (GBusType bus_type,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_bus_get_finish (GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_bus_get_sync (GBusType bus_type,
GCancellable *cancellable,
GError **error);
/* ---------------------------------------------------------------------------------------------------- */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_new (GIOStream *stream,
const gchar *guid,
GDBusConnectionFlags flags,
@@ -63,10 +63,10 @@ void g_dbus_connection_new (GIOStream
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_connection_new_finish (GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_connection_new_sync (GIOStream *stream,
const gchar *guid,
GDBusConnectionFlags flags,
@@ -74,17 +74,17 @@ GDBusConnection *g_dbus_connection_new_sync (GIOStream
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_new_for_address (const gchar *address,
GDBusConnectionFlags flags,
GDBusAuthObserver *observer,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_connection_new_for_address_finish (GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_connection_new_for_address_sync (const gchar *address,
GDBusConnectionFlags flags,
GDBusAuthObserver *observer,
@@ -93,73 +93,73 @@ GDBusConnection *g_dbus_connection_new_for_address_sync (const gchar
/* ---------------------------------------------------------------------------------------------------- */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_start_message_processing (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_is_closed (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream *g_dbus_connection_get_stream (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_connection_get_guid (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_connection_get_unique_name (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCredentials *g_dbus_connection_get_peer_credentials (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
guint32 g_dbus_connection_get_last_serial (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_get_exit_on_close (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_set_exit_on_close (GDBusConnection *connection,
gboolean exit_on_close);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusCapabilityFlags g_dbus_connection_get_capabilities (GDBusConnection *connection);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
GDBusConnectionFlags g_dbus_connection_get_flags (GDBusConnection *connection);
/* ---------------------------------------------------------------------------------------------------- */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_close (GDBusConnection *connection,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_close_finish (GDBusConnection *connection,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_close_sync (GDBusConnection *connection,
GCancellable *cancellable,
GError **error);
/* ---------------------------------------------------------------------------------------------------- */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_flush (GDBusConnection *connection,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_flush_finish (GDBusConnection *connection,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_flush_sync (GDBusConnection *connection,
GCancellable *cancellable,
GError **error);
/* ---------------------------------------------------------------------------------------------------- */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_send_message (GDBusConnection *connection,
GDBusMessage *message,
GDBusSendMessageFlags flags,
volatile guint32 *out_serial,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_send_message_with_reply (GDBusConnection *connection,
GDBusMessage *message,
GDBusSendMessageFlags flags,
@@ -168,11 +168,11 @@ void g_dbus_connection_send_message_with_reply (GDBusConnecti
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_connection_send_message_with_reply_finish (GDBusConnection *connection,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_connection_send_message_with_reply_sync (GDBusConnection *connection,
GDBusMessage *message,
GDBusSendMessageFlags flags,
@@ -183,7 +183,7 @@ GDBusMessage *g_dbus_connection_send_message_with_reply_sync (GDBusConnecti
/* ---------------------------------------------------------------------------------------------------- */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_emit_signal (GDBusConnection *connection,
const gchar *destination_bus_name,
const gchar *object_path,
@@ -191,7 +191,7 @@ gboolean g_dbus_connection_emit_signal (GDBusConnection
const gchar *signal_name,
GVariant *parameters,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_call (GDBusConnection *connection,
const gchar *bus_name,
const gchar *object_path,
@@ -204,11 +204,11 @@ void g_dbus_connection_call (GDBusConnection
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_connection_call_finish (GDBusConnection *connection,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_connection_call_sync (GDBusConnection *connection,
const gchar *bus_name,
const gchar *object_path,
@@ -223,7 +223,7 @@ GVariant *g_dbus_connection_call_sync (GDBusConnection
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
void g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection,
const gchar *bus_name,
const gchar *object_path,
@@ -237,12 +237,12 @@ void g_dbus_connection_call_with_unix_fd_list (GDBusConnection
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
GVariant *g_dbus_connection_call_with_unix_fd_list_finish (GDBusConnection *connection,
GUnixFDList **out_fd_list,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
GVariant *g_dbus_connection_call_with_unix_fd_list_sync (GDBusConnection *connection,
const gchar *bus_name,
const gchar *object_path,
@@ -402,7 +402,7 @@ struct _GDBusInterfaceVTable
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_dbus_connection_register_object (GDBusConnection *connection,
const gchar *object_path,
GDBusInterfaceInfo *interface_info,
@@ -410,7 +410,7 @@ guint g_dbus_connection_register_object (GDBusConnection
gpointer user_data,
GDestroyNotify
user_data_free_func,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
guint g_dbus_connection_register_object_with_closures (GDBusConnection *connection,
const gchar *object_path,
GDBusInterfaceInfo *interface_info,
@@ -418,7 +418,7 @@ guint g_dbus_connection_register_object_with_closures (GDBusConnectio
GClosure
*get_property_closure,
GClosure
*set_property_closure,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_unregister_object (GDBusConnection *connection,
guint registration_id);
@@ -540,7 +540,7 @@ struct _GDBusSubtreeVTable
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_dbus_connection_register_subtree (GDBusConnection *connection,
const gchar *object_path,
const GDBusSubtreeVTable *vtable,
@@ -548,7 +548,7 @@ guint g_dbus_connection_register_subtree (GDBusConnection
gpointer user_data,
GDestroyNotify
user_data_free_func,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_connection_unregister_subtree (GDBusConnection *connection,
guint registration_id);
@@ -577,7 +577,7 @@ typedef void (*GDBusSignalCallback) (GDBusConnection *connection,
GVariant *parameters,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_dbus_connection_signal_subscribe (GDBusConnection *connection,
const gchar *sender,
const gchar *interface_name,
@@ -588,7 +588,7 @@ guint g_dbus_connection_signal_subscribe (GDBusConnection
GDBusSignalCallback callback,
gpointer user_data,
GDestroyNotify user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_signal_unsubscribe (GDBusConnection *connection,
guint subscription_id);
@@ -673,13 +673,13 @@ typedef GDBusMessage *(*GDBusMessageFilterFunction) (GDBusConnection *connection
gboolean incoming,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_dbus_connection_add_filter (GDBusConnection *connection,
GDBusMessageFilterFunction filter_function,
gpointer user_data,
GDestroyNotify user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_connection_remove_filter (GDBusConnection *connection,
guint filter_id);
diff --git a/gio/gdbuserror.h b/gio/gdbuserror.h
index d35d07b292..6a849348f4 100644
--- a/gio/gdbuserror.h
+++ b/gio/gdbuserror.h
@@ -47,15 +47,15 @@ G_BEGIN_DECLS
*/
#define G_DBUS_ERROR g_dbus_error_quark()
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GQuark g_dbus_error_quark (void);
/* Used by applications to check, get and strip the D-Bus error name */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_error_is_remote_error (const GError *error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_dbus_error_get_remote_error (const GError *error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_error_strip_remote_error (GError *error);
/**
@@ -73,37 +73,37 @@ struct _GDBusErrorEntry
const gchar *dbus_error_name;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_error_register_error (GQuark error_domain,
gint error_code,
const gchar *dbus_error_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_error_unregister_error (GQuark error_domain,
gint error_code,
const gchar *dbus_error_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_error_register_error_domain (const gchar *error_domain_quark_name,
volatile gsize *quark_volatile,
const GDBusErrorEntry *entries,
guint num_entries);
/* Only used by object mappings to map back and forth to GError */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GError *g_dbus_error_new_for_dbus_error (const gchar *dbus_error_name,
const gchar *dbus_error_message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_error_set_dbus_error (GError **error,
const gchar *dbus_error_name,
const gchar *dbus_error_message,
const gchar *format,
...) G_GNUC_PRINTF(4, 5);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_error_set_dbus_error_valist (GError **error,
const gchar *dbus_error_name,
const gchar *dbus_error_message,
const gchar *format,
va_list var_args) G_GNUC_PRINTF(4, 0);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_dbus_error_encode_gerror (const GError *error);
G_END_DECLS
diff --git a/gio/gdbusinterface.h b/gio/gdbusinterface.h
index 83e524bab0..838a54e07a 100644
--- a/gio/gdbusinterface.h
+++ b/gio/gdbusinterface.h
@@ -66,16 +66,16 @@ struct _GDBusInterfaceIface
GDBusObject *(*dup_object) (GDBusInterface *interface_);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_interface_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterfaceInfo *g_dbus_interface_get_info (GDBusInterface *interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObject *g_dbus_interface_get_object (GDBusInterface *interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_set_object (GDBusInterface *interface_,
GDBusObject *object);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GDBusObject *g_dbus_interface_dup_object (GDBusInterface *interface_);
G_END_DECLS
diff --git a/gio/gdbusinterfaceskeleton.h b/gio/gdbusinterfaceskeleton.h
index bc13b74e92..244ee0e641 100644
--- a/gio/gdbusinterfaceskeleton.h
+++ b/gio/gdbusinterfaceskeleton.h
@@ -87,41 +87,41 @@ struct _GDBusInterfaceSkeletonClass
gpointer signal_padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_interface_skeleton_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterfaceSkeletonFlags g_dbus_interface_skeleton_get_flags (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_skeleton_set_flags (GDBusInterfaceSkeleton
*interface_,
GDBusInterfaceSkeletonFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterfaceInfo *g_dbus_interface_skeleton_get_info (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterfaceVTable *g_dbus_interface_skeleton_get_vtable (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_interface_skeleton_get_properties (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_skeleton_flush (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_interface_skeleton_export (GDBusInterfaceSkeleton
*interface_,
GDBusConnection
*connection,
const gchar
*object_path,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_skeleton_unexport (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_skeleton_unexport_from_connection (GDBusInterfaceSkeleton
*interface_,
GDBusConnection
*connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_interface_skeleton_get_connection (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_dbus_interface_skeleton_get_connections (GDBusInterfaceSkeleton
*interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_interface_skeleton_has_connection (GDBusInterfaceSkeleton
*interface_,
GDBusConnection
*connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_interface_skeleton_get_object_path (GDBusInterfaceSkeleton
*interface_);
G_END_DECLS
diff --git a/gio/gdbusintrospection.h b/gio/gdbusintrospection.h
index e2fbf5e6eb..53f4685000 100644
--- a/gio/gdbusintrospection.h
+++ b/gio/gdbusintrospection.h
@@ -181,67 +181,67 @@ struct _GDBusNodeInfo
GDBusAnnotationInfo **annotations;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_annotation_info_lookup (GDBusAnnotationInfo **annotations,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMethodInfo *g_dbus_interface_info_lookup_method (GDBusInterfaceInfo *info,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusSignalInfo *g_dbus_interface_info_lookup_signal (GDBusInterfaceInfo *info,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusPropertyInfo *g_dbus_interface_info_lookup_property (GDBusInterfaceInfo *info,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_info_cache_build (GDBusInterfaceInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_info_cache_release (GDBusInterfaceInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_info_generate_xml (GDBusInterfaceInfo *info,
guint indent,
GString *string_builder);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusNodeInfo *g_dbus_node_info_new_for_xml (const gchar *xml_data,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterfaceInfo *g_dbus_node_info_lookup_interface (GDBusNodeInfo *info,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_node_info_generate_xml (GDBusNodeInfo *info,
guint indent,
GString *string_builder);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusNodeInfo *g_dbus_node_info_ref (GDBusNodeInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterfaceInfo *g_dbus_interface_info_ref (GDBusInterfaceInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMethodInfo *g_dbus_method_info_ref (GDBusMethodInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusSignalInfo *g_dbus_signal_info_ref (GDBusSignalInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusPropertyInfo *g_dbus_property_info_ref (GDBusPropertyInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusArgInfo *g_dbus_arg_info_ref (GDBusArgInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusAnnotationInfo *g_dbus_annotation_info_ref (GDBusAnnotationInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_node_info_unref (GDBusNodeInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_interface_info_unref (GDBusInterfaceInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_info_unref (GDBusMethodInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_signal_info_unref (GDBusSignalInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_property_info_unref (GDBusPropertyInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_arg_info_unref (GDBusArgInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_annotation_info_unref (GDBusAnnotationInfo *info);
/**
@@ -307,19 +307,19 @@ void g_dbus_annotation_info_unref (GDBusAnnotationInfo
*/
#define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ())
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_node_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_interface_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_method_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_signal_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_property_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_arg_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/gio/gdbusmenumodel.h b/gio/gdbusmenumodel.h
index 5e9a9ce09d..73489b5bb1 100644
--- a/gio/gdbusmenumodel.h
+++ b/gio/gdbusmenumodel.h
@@ -34,10 +34,10 @@ G_BEGIN_DECLS
typedef struct _GDBusMenuModel GDBusMenuModel;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_menu_model_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMenuModel * g_dbus_menu_model_get (GDBusConnection *connection,
const gchar *bus_name,
const gchar *object_path);
diff --git a/gio/gdbusmessage.h b/gio/gdbusmessage.h
index 84e3c5ffff..6e4bb9e8e4 100644
--- a/gio/gdbusmessage.h
+++ b/gio/gdbusmessage.h
@@ -35,167 +35,167 @@ G_BEGIN_DECLS
#define G_DBUS_MESSAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage))
#define G_IS_DBUS_MESSAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE))
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_message_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_signal (const gchar *path,
const gchar *interface_,
const gchar *signal);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_method_call (const gchar *name,
const gchar *path,
const gchar *interface_,
const gchar *method);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_method_reply (GDBusMessage *method_call_message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_method_error (GDBusMessage *method_call_message,
const gchar *error_name,
const gchar *error_message_format,
...) G_GNUC_PRINTF(3, 4);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_method_error_valist (GDBusMessage
*method_call_message,
const gchar *error_name,
const gchar
*error_message_format,
va_list var_args);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_method_error_literal (GDBusMessage
*method_call_message,
const gchar *error_name,
const gchar *error_message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_dbus_message_print (GDBusMessage *message,
guint indent);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_message_get_locked (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_lock (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_copy (GDBusMessage *message,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessageByteOrder g_dbus_message_get_byte_order (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_byte_order (GDBusMessage *message,
GDBusMessageByteOrder byte_order);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessageType g_dbus_message_get_message_type (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_message_type (GDBusMessage *message,
GDBusMessageType type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessageFlags g_dbus_message_get_flags (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_flags (GDBusMessage *message,
GDBusMessageFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint32 g_dbus_message_get_serial (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_serial (GDBusMessage *message,
guint32 serial);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_message_get_header (GDBusMessage *message,
GDBusMessageHeaderField header_field);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_header (GDBusMessage *message,
GDBusMessageHeaderField header_field,
GVariant *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guchar *g_dbus_message_get_header_fields (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_message_get_body (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_body (GDBusMessage *message,
GVariant *body);
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GUnixFDList *g_dbus_message_get_unix_fd_list (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_unix_fd_list (GDBusMessage *message,
GUnixFDList *fd_list);
#endif /* G_OS_UNIX */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint32 g_dbus_message_get_reply_serial (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_reply_serial (GDBusMessage *message,
guint32 value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_interface (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_interface (GDBusMessage *message,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_member (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_member (GDBusMessage *message,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_path (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_path (GDBusMessage *message,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_sender (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_sender (GDBusMessage *message,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_destination (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_destination (GDBusMessage *message,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_error_name (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_error_name (GDBusMessage *message,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_signature (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_signature (GDBusMessage *message,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint32 g_dbus_message_get_num_unix_fds (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_message_set_num_unix_fds (GDBusMessage *message,
guint32 value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_message_get_arg0 (GDBusMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_message_new_from_blob (guchar *blob,
gsize blob_len,
GDBusCapabilityFlags capabilities,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_dbus_message_bytes_needed (guchar *blob,
gsize blob_len,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guchar *g_dbus_message_to_blob (GDBusMessage *message,
gsize *out_size,
GDBusCapabilityFlags capabilities,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_message_to_gerror (GDBusMessage *message,
GError **error);
diff --git a/gio/gdbusmethodinvocation.h b/gio/gdbusmethodinvocation.h
index c5751cc5c1..6266f38a31 100644
--- a/gio/gdbusmethodinvocation.h
+++ b/gio/gdbusmethodinvocation.h
@@ -53,7 +53,7 @@ G_BEGIN_DECLS
*
* Since: 2.68
*/
-#define G_DBUS_METHOD_INVOCATION_HANDLED TRUE GLIB_AVAILABLE_MACRO_IN_2_68
+#define G_DBUS_METHOD_INVOCATION_HANDLED TRUE GIO_AVAILABLE_MACRO_IN_2_68
/**
* G_DBUS_METHOD_INVOCATION_UNHANDLED:
@@ -68,65 +68,65 @@ G_BEGIN_DECLS
*
* Since: 2.68
*/
-#define G_DBUS_METHOD_INVOCATION_UNHANDLED FALSE GLIB_AVAILABLE_MACRO_IN_2_68
+#define G_DBUS_METHOD_INVOCATION_UNHANDLED FALSE GIO_AVAILABLE_MACRO_IN_2_68
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_method_invocation_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_method_invocation_get_sender (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_method_invocation_get_object_path (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_method_invocation_get_interface_name (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_method_invocation_get_method_name (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const GDBusMethodInfo *g_dbus_method_invocation_get_method_info (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
const GDBusPropertyInfo *g_dbus_method_invocation_get_property_info (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_method_invocation_get_connection (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusMessage *g_dbus_method_invocation_get_message (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_method_invocation_get_parameters (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gpointer g_dbus_method_invocation_get_user_data (GDBusMethodInvocation *invocation);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_value (GDBusMethodInvocation *invocation,
GVariant *parameters);
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation
*invocation,
GVariant
*parameters,
GUnixFDList
*fd_list);
#endif /* G_OS_UNIX */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_error (GDBusMethodInvocation *invocation,
GQuark domain,
gint code,
const gchar *format,
...) G_GNUC_PRINTF(4, 5);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_error_valist (GDBusMethodInvocation *invocation,
GQuark domain,
gint code,
const gchar *format,
va_list var_args)
G_GNUC_PRINTF(4, 0);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation,
GQuark domain,
gint code,
const gchar *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_gerror (GDBusMethodInvocation *invocation,
const GError *error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_take_error (GDBusMethodInvocation *invocation,
GError *error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_method_invocation_return_dbus_error (GDBusMethodInvocation *invocation,
const gchar *error_name,
const gchar *error_message);
diff --git a/gio/gdbusnameowning.h b/gio/gdbusnameowning.h
index fbeb961c3f..2afd3ee731 100644
--- a/gio/gdbusnameowning.h
+++ b/gio/gdbusnameowning.h
@@ -74,7 +74,7 @@ typedef void (*GBusNameLostCallback) (GDBusConnection *connection,
const gchar *name,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_own_name (GBusType bus_type,
const gchar *name,
GBusNameOwnerFlags flags,
@@ -84,7 +84,7 @@ guint g_bus_own_name (GBusType bus_type,
gpointer user_data,
GDestroyNotify user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_own_name_on_connection (GDBusConnection *connection,
const gchar *name,
GBusNameOwnerFlags flags,
@@ -93,7 +93,7 @@ guint g_bus_own_name_on_connection (GDBusConnection *connection,
gpointer user_data,
GDestroyNotify user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_own_name_with_closures (GBusType bus_type,
const gchar *name,
GBusNameOwnerFlags flags,
@@ -101,7 +101,7 @@ guint g_bus_own_name_with_closures (GBusType bus_type,
GClosure *name_acquired_closure,
GClosure *name_lost_closure);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_own_name_on_connection_with_closures (
GDBusConnection *connection,
const gchar *name,
@@ -109,7 +109,7 @@ guint g_bus_own_name_on_connection_with_closures (
GClosure *name_acquired_closure,
GClosure *name_lost_closure);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_bus_unown_name (guint owner_id);
G_END_DECLS
diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h
index a344e2c096..df836deb56 100644
--- a/gio/gdbusnamewatching.h
+++ b/gio/gdbusnamewatching.h
@@ -67,7 +67,7 @@ typedef void (*GBusNameVanishedCallback) (GDBusConnection *connection,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_watch_name (GBusType bus_type,
const gchar *name,
GBusNameWatcherFlags flags,
@@ -75,7 +75,7 @@ guint g_bus_watch_name (GBusType bus_type,
GBusNameVanishedCallback name_vanished_handler,
gpointer user_data,
GDestroyNotify user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_watch_name_on_connection (GDBusConnection *connection,
const gchar *name,
GBusNameWatcherFlags flags,
@@ -83,20 +83,20 @@ guint g_bus_watch_name_on_connection (GDBusConnection *connection,
GBusNameVanishedCallback name_vanished_handler,
gpointer user_data,
GDestroyNotify user_data_free_func);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_watch_name_with_closures (GBusType bus_type,
const gchar *name,
GBusNameWatcherFlags flags,
GClosure *name_appeared_closure,
GClosure *name_vanished_closure);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_bus_watch_name_on_connection_with_closures (
GDBusConnection *connection,
const gchar *name,
GBusNameWatcherFlags flags,
GClosure *name_appeared_closure,
GClosure *name_vanished_closure);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_bus_unwatch_name (guint watcher_id);
G_END_DECLS
diff --git a/gio/gdbusobject.h b/gio/gdbusobject.h
index 050534e576..b8186afc46 100644
--- a/gio/gdbusobject.h
+++ b/gio/gdbusobject.h
@@ -65,13 +65,13 @@ struct _GDBusObjectIface
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_object_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_object_get_object_path (GDBusObject *object);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_dbus_object_get_interfaces (GDBusObject *object);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterface *g_dbus_object_get_interface (GDBusObject *object,
const gchar *interface_name);
diff --git a/gio/gdbusobjectmanager.h b/gio/gdbusobjectmanager.h
index 908d96cd1c..7bfa2ae024 100644
--- a/gio/gdbusobjectmanager.h
+++ b/gio/gdbusobjectmanager.h
@@ -77,16 +77,16 @@ struct _GDBusObjectManagerIface
GDBusInterface *interface_);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_object_manager_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_object_manager_get_object_path (GDBusObjectManager *manager);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_dbus_object_manager_get_objects (GDBusObjectManager *manager);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObject *g_dbus_object_manager_get_object (GDBusObjectManager *manager,
const gchar *object_path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterface *g_dbus_object_manager_get_interface (GDBusObjectManager *manager,
const gchar *object_path,
const gchar *interface_name);
diff --git a/gio/gdbusobjectmanagerclient.h b/gio/gdbusobjectmanagerclient.h
index c00e682523..2ebeedc029 100644
--- a/gio/gdbusobjectmanagerclient.h
+++ b/gio/gdbusobjectmanagerclient.h
@@ -84,9 +84,9 @@ struct _GDBusObjectManagerClientClass
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_object_manager_client_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_manager_client_new (GDBusConnection
*connection,
GDBusObjectManagerClientFlags
flags,
const gchar
*name,
@@ -97,10 +97,10 @@ void g_dbus_object_manager_client_new (G
GCancellable
*cancellable,
GAsyncReadyCallback
callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectManager *g_dbus_object_manager_client_new_finish (GAsyncResult
*res,
GError
**error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectManager *g_dbus_object_manager_client_new_sync (GDBusConnection
*connection,
GDBusObjectManagerClientFlags
flags,
const gchar
*name,
@@ -110,7 +110,7 @@ GDBusObjectManager *g_dbus_object_manager_client_new_sync (G
GDestroyNotify
get_proxy_type_destroy_notify,
GCancellable
*cancellable,
GError
**error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_manager_client_new_for_bus (GBusType
bus_type,
GDBusObjectManagerClientFlags
flags,
const gchar
*name,
@@ -121,10 +121,10 @@ void g_dbus_object_manager_client_new_for_bus (G
GCancellable
*cancellable,
GAsyncReadyCallback
callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectManager *g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult
*res,
GError
**error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectManager *g_dbus_object_manager_client_new_for_bus_sync (GBusType
bus_type,
GDBusObjectManagerClientFlags
flags,
const gchar
*name,
@@ -134,13 +134,13 @@ GDBusObjectManager *g_dbus_object_manager_client_new_for_bus_sync (G
GDestroyNotify
get_proxy_type_destroy_notify,
GCancellable
*cancellable,
GError
**error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_object_manager_client_get_connection (GDBusObjectManagerClient
*manager);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectManagerClientFlags g_dbus_object_manager_client_get_flags (GDBusObjectManagerClient
*manager);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_object_manager_client_get_name (GDBusObjectManagerClient
*manager);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_dbus_object_manager_client_get_name_owner (GDBusObjectManagerClient
*manager);
G_END_DECLS
diff --git a/gio/gdbusobjectmanagerserver.h b/gio/gdbusobjectmanagerserver.h
index b81823dece..92543dd3a0 100644
--- a/gio/gdbusobjectmanagerserver.h
+++ b/gio/gdbusobjectmanagerserver.h
@@ -68,25 +68,25 @@ struct _GDBusObjectManagerServerClass
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_object_manager_server_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectManagerServer *g_dbus_object_manager_server_new (const gchar
*object_path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_object_manager_server_get_connection (GDBusObjectManagerServer
*manager);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_manager_server_set_connection (GDBusObjectManagerServer
*manager,
GDBusConnection
*connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_manager_server_export (GDBusObjectManagerServer
*manager,
GDBusObjectSkeleton
*object);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer
*manager,
GDBusObjectSkeleton
*object);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_object_manager_server_is_exported (GDBusObjectManagerServer
*manager,
GDBusObjectSkeleton
*object);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_object_manager_server_unexport (GDBusObjectManagerServer
*manager,
const gchar
*object_path);
diff --git a/gio/gdbusobjectproxy.h b/gio/gdbusobjectproxy.h
index d7a450d7ef..ea5af0f09f 100644
--- a/gio/gdbusobjectproxy.h
+++ b/gio/gdbusobjectproxy.h
@@ -68,12 +68,12 @@ struct _GDBusObjectProxyClass
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_object_proxy_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectProxy *g_dbus_object_proxy_new (GDBusConnection *connection,
const gchar *object_path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_object_proxy_get_connection (GDBusObjectProxy *proxy);
G_END_DECLS
diff --git a/gio/gdbusobjectskeleton.h b/gio/gdbusobjectskeleton.h
index 417dd6e544..b15a2884f7 100644
--- a/gio/gdbusobjectskeleton.h
+++ b/gio/gdbusobjectskeleton.h
@@ -74,22 +74,22 @@ struct _GDBusObjectSkeletonClass
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_object_skeleton_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusObjectSkeleton *g_dbus_object_skeleton_new (const gchar *object_path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_skeleton_flush (GDBusObjectSkeleton *object);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_skeleton_add_interface (GDBusObjectSkeleton *object,
GDBusInterfaceSkeleton *interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_skeleton_remove_interface (GDBusObjectSkeleton *object,
GDBusInterfaceSkeleton *interface_);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_skeleton_remove_interface_by_name (GDBusObjectSkeleton *object,
const gchar
*interface_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_object_skeleton_set_object_path (GDBusObjectSkeleton *object,
const gchar *object_path);
diff --git a/gio/gdbusprivate.h b/gio/gdbusprivate.h
index 028129e333..6a4c8e099c 100644
--- a/gio/gdbusprivate.h
+++ b/gio/gdbusprivate.h
@@ -119,7 +119,7 @@ gchar *_g_dbus_win32_get_user_sid (void);
* Initially this function was introduces for usage with rundll,
* so the signature is kept rundll-compatible, though parameters aren't used.
*/
-_GLIB_EXTERN void __stdcall
+_GIO_EXTERN void __stdcall
g_win32_run_session_bus (void* hwnd, void* hinst, const char* cmdline, int cmdshow);
gchar *_g_dbus_win32_get_session_address_dbus_launch (GError **error);
#endif
diff --git a/gio/gdbusproxy.h b/gio/gdbusproxy.h
index aac6663eca..7483156f81 100644
--- a/gio/gdbusproxy.h
+++ b/gio/gdbusproxy.h
@@ -86,9 +86,9 @@ struct _GDBusProxyClass
gpointer padding[32];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_proxy_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_proxy_new (GDBusConnection *connection,
GDBusProxyFlags flags,
GDBusInterfaceInfo *info,
@@ -98,10 +98,10 @@ void g_dbus_proxy_new (GDBusConnection *co
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusProxy *g_dbus_proxy_new_finish (GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusProxy *g_dbus_proxy_new_sync (GDBusConnection *connection,
GDBusProxyFlags flags,
GDBusInterfaceInfo *info,
@@ -110,7 +110,7 @@ GDBusProxy *g_dbus_proxy_new_sync (GDBusConnection *co
const gchar *interface_name,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_proxy_new_for_bus (GBusType bus_type,
GDBusProxyFlags flags,
GDBusInterfaceInfo *info,
@@ -120,10 +120,10 @@ void g_dbus_proxy_new_for_bus (GBusType bu
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusProxy *g_dbus_proxy_new_for_bus_finish (GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusProxy *g_dbus_proxy_new_for_bus_sync (GBusType bus_type,
GDBusProxyFlags flags,
GDBusInterfaceInfo *info,
@@ -132,38 +132,38 @@ GDBusProxy *g_dbus_proxy_new_for_bus_sync (GBusType bu
const gchar *interface_name,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusConnection *g_dbus_proxy_get_connection (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusProxyFlags g_dbus_proxy_get_flags (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_proxy_get_name (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_dbus_proxy_get_name_owner (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_proxy_get_object_path (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_proxy_get_interface_name (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_dbus_proxy_get_default_timeout (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_proxy_set_default_timeout (GDBusProxy *proxy,
gint timeout_msec);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusInterfaceInfo *g_dbus_proxy_get_interface_info (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_proxy_set_interface_info (GDBusProxy *proxy,
GDBusInterfaceInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_proxy_get_cached_property (GDBusProxy *proxy,
const gchar *property_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_proxy_set_cached_property (GDBusProxy *proxy,
const gchar *property_name,
GVariant *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar **g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_proxy_call (GDBusProxy *proxy,
const gchar *method_name,
GVariant *parameters,
@@ -172,11 +172,11 @@ void g_dbus_proxy_call (GDBusProxy *pr
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_proxy_call_finish (GDBusProxy *proxy,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_proxy_call_sync (GDBusProxy *proxy,
const gchar *method_name,
GVariant *parameters,
@@ -187,7 +187,7 @@ GVariant *g_dbus_proxy_call_sync (GDBusProxy *pr
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy,
const gchar *method_name,
GVariant *parameters,
@@ -197,12 +197,12 @@ void g_dbus_proxy_call_with_unix_fd_list (GDBusProxy
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy *proxy,
GUnixFDList **out_fd_list,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_proxy_call_with_unix_fd_list_sync (GDBusProxy *proxy,
const gchar *method_name,
GVariant *parameters,
diff --git a/gio/gdbusserver.h b/gio/gdbusserver.h
index 63dd4cbbf3..8d460e360a 100644
--- a/gio/gdbusserver.h
+++ b/gio/gdbusserver.h
@@ -35,26 +35,26 @@ G_BEGIN_DECLS
#define G_DBUS_SERVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_SERVER, GDBusServer))
#define G_IS_DBUS_SERVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER))
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_dbus_server_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusServer *g_dbus_server_new_sync (const gchar *address,
GDBusServerFlags flags,
const gchar *guid,
GDBusAuthObserver *observer,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_server_get_client_address (GDBusServer *server);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_dbus_server_get_guid (GDBusServer *server);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDBusServerFlags g_dbus_server_get_flags (GDBusServer *server);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_server_start (GDBusServer *server);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_server_stop (GDBusServer *server);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_server_is_active (GDBusServer *server);
G_END_DECLS
diff --git a/gio/gdbusutils.h b/gio/gdbusutils.h
index c0f2ba5052..3003b7165b 100644
--- a/gio/gdbusutils.h
+++ b/gio/gdbusutils.h
@@ -31,33 +31,33 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_is_guid (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_dbus_generate_guid (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_is_name (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_is_unique_name (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_is_member_name (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_dbus_is_interface_name (const gchar *string);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
gboolean g_dbus_is_error_name (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_dbus_gvariant_to_gvalue (GVariant *value,
GValue *out_gvalue);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant *g_dbus_gvalue_to_gvariant (const GValue *gvalue,
const GVariantType *type);
-GLIB_AVAILABLE_IN_2_68
+GIO_AVAILABLE_IN_2_68
gchar *g_dbus_escape_object_path_bytestring (const guint8 *bytes);
-GLIB_AVAILABLE_IN_2_68
+GIO_AVAILABLE_IN_2_68
gchar *g_dbus_escape_object_path (const gchar *s);
-GLIB_AVAILABLE_IN_2_68
+GIO_AVAILABLE_IN_2_68
guint8 *g_dbus_unescape_object_path (const gchar *s);
G_END_DECLS
diff --git a/gio/gdebugcontroller.h b/gio/gdebugcontroller.h
index 38160343d7..e59cd348d7 100644
--- a/gio/gdebugcontroller.h
+++ b/gio/gdebugcontroller.h
@@ -50,7 +50,7 @@ G_BEGIN_DECLS
* Since: 2.72
*/
#define G_TYPE_DEBUG_CONTROLLER (g_debug_controller_get_type ())
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
G_DECLARE_INTERFACE(GDebugController, g_debug_controller, g, debug_controller, GObject)
#define G_DEBUG_CONTROLLER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DEBUG_CONTROLLER,
GDebugController))
@@ -70,9 +70,9 @@ struct _GDebugControllerInterface {
GTypeInterface g_iface;
};
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
gboolean g_debug_controller_get_debug_enabled (GDebugController *self);
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
void g_debug_controller_set_debug_enabled (GDebugController *self,
gboolean debug_enabled);
diff --git a/gio/gdebugcontrollerdbus.h b/gio/gdebugcontrollerdbus.h
index d28545bb65..c6e6c700cc 100644
--- a/gio/gdebugcontrollerdbus.h
+++ b/gio/gdebugcontrollerdbus.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
* Since: 2.72
*/
#define G_TYPE_DEBUG_CONTROLLER_DBUS (g_debug_controller_dbus_get_type ())
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
G_DECLARE_DERIVABLE_TYPE (GDebugControllerDBus, g_debug_controller_dbus, G, DEBUG_CONTROLLER_DBUS, GObject)
/**
@@ -58,12 +58,12 @@ struct _GDebugControllerDBusClass
gpointer padding[12];
};
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
GDebugControllerDBus *g_debug_controller_dbus_new (GDBusConnection *connection,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
void g_debug_controller_dbus_stop (GDebugControllerDBus *self);
G_END_DECLS
diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h
index 9df12f8a75..1ca7d51bad 100644
--- a/gio/gdesktopappinfo.h
+++ b/gio/gdesktopappinfo.h
@@ -45,73 +45,73 @@ struct _GDesktopAppInfoClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_desktop_app_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char *filename);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDesktopAppInfo *g_desktop_app_info_new_from_keyfile (GKeyFile *key_file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_desktop_app_info_get_filename (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
const char * g_desktop_app_info_get_generic_name (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
const char * g_desktop_app_info_get_categories (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
const char * const *g_desktop_app_info_get_keywords (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
gboolean g_desktop_app_info_get_nodisplay (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
gboolean g_desktop_app_info_get_show_in (GDesktopAppInfo *info,
const gchar *desktop_env);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
const char * g_desktop_app_info_get_startup_wm_class (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDesktopAppInfo *g_desktop_app_info_new (const char *desktop_id);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info);
-GLIB_DEPRECATED_IN_2_42
+GIO_DEPRECATED_IN_2_42
void g_desktop_app_info_set_desktop_env (const char *desktop_env);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_desktop_app_info_has_key (GDesktopAppInfo *info,
const char *key);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
char * g_desktop_app_info_get_string (GDesktopAppInfo *info,
const char *key);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
char * g_desktop_app_info_get_locale_string (GDesktopAppInfo *info,
const char *key);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_desktop_app_info_get_boolean (GDesktopAppInfo *info,
const char *key);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
gchar ** g_desktop_app_info_get_string_list (GDesktopAppInfo *info,
const char *key,
gsize *length);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
const gchar * const * g_desktop_app_info_list_actions (GDesktopAppInfo *info);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_desktop_app_info_launch_action (GDesktopAppInfo *info,
const gchar *action_name,
GAppLaunchContext *launch_context);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
gchar * g_desktop_app_info_get_action_name (GDesktopAppInfo *info,
const gchar *action_name);
-#define G_TYPE_DESKTOP_APP_INFO_LOOKUP (g_desktop_app_info_lookup_get_type ())
GLIB_DEPRECATED_MACRO_IN_2_28
-#define G_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookup)) GLIB_DEPRECATED_MACRO_IN_2_28
-#define G_IS_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
G_TYPE_DESKTOP_APP_INFO_LOOKUP)) GLIB_DEPRECATED_MACRO_IN_2_28
-#define G_DESKTOP_APP_INFO_LOOKUP_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj),
G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookupIface)) GLIB_DEPRECATED_MACRO_IN_2_28
+#define G_TYPE_DESKTOP_APP_INFO_LOOKUP (g_desktop_app_info_lookup_get_type ())
GIO_DEPRECATED_MACRO_IN_2_28
+#define G_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookup)) GIO_DEPRECATED_MACRO_IN_2_28
+#define G_IS_DESKTOP_APP_INFO_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
G_TYPE_DESKTOP_APP_INFO_LOOKUP)) GIO_DEPRECATED_MACRO_IN_2_28
+#define G_DESKTOP_APP_INFO_LOOKUP_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj),
G_TYPE_DESKTOP_APP_INFO_LOOKUP, GDesktopAppInfoLookupIface)) GIO_DEPRECATED_MACRO_IN_2_28
/**
* G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME:
@@ -122,7 +122,7 @@ gchar * g_desktop_app_info_get_action_name (GDeskto
* Deprecated: 2.28: The #GDesktopAppInfoLookup interface is deprecated and
* unused by GIO.
*/
-#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup"
GLIB_DEPRECATED_MACRO_IN_2_28
+#define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup"
GIO_DEPRECATED_MACRO_IN_2_28
/**
* GDesktopAppInfoLookupIface:
@@ -143,10 +143,10 @@ struct _GDesktopAppInfoLookupIface
const char *uri_scheme);
};
-GLIB_DEPRECATED
+GIO_DEPRECATED
GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST;
-GLIB_DEPRECATED
+GIO_DEPRECATED
GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
const char *uri_scheme);
@@ -164,7 +164,7 @@ typedef void (*GDesktopAppLaunchCallback) (GDesktopAppInfo *appinfo,
GPid pid,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_28
+GIO_AVAILABLE_IN_2_28
gboolean g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo *appinfo,
GList *uris,
GAppLaunchContext *launch_context,
@@ -175,7 +175,7 @@ gboolean g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo
gpointer pid_callback_data,
GError **error);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
gboolean g_desktop_app_info_launch_uris_as_manager_with_fds (GDesktopAppInfo *appinfo,
GList *uris,
GAppLaunchContext *launch_context,
@@ -189,10 +189,10 @@ gboolean g_desktop_app_info_launch_uris_as_manager_with_fds (GDesktopAppInfo
gint stderr_fd,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gchar *** g_desktop_app_info_search (const gchar *search_string);
-GLIB_AVAILABLE_IN_2_42
+GIO_AVAILABLE_IN_2_42
GList *g_desktop_app_info_get_implementations (const gchar *interface);
G_END_DECLS
diff --git a/gio/gdrive.h b/gio/gdrive.h
index f5a5d122ac..7551a4025a 100644
--- a/gio/gdrive.h
+++ b/gio/gdrive.h
@@ -170,103 +170,103 @@ struct _GDriveIface
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_drive_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_drive_get_name (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_drive_get_icon (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_drive_get_symbolic_icon (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_has_volumes (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_drive_get_volumes (GDrive *drive);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
gboolean g_drive_is_removable (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_is_media_removable (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_has_media (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_is_media_check_automatic (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_can_poll_for_media (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_can_eject (GDrive *drive);
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation)
+GIO_DEPRECATED_FOR(g_drive_eject_with_operation)
void g_drive_eject (GDrive *drive,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish)
+GIO_DEPRECATED_FOR(g_drive_eject_with_operation_finish)
gboolean g_drive_eject_finish (GDrive *drive,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_drive_poll_for_media (GDrive *drive,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_poll_for_media_finish (GDrive *drive,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_drive_get_identifier (GDrive *drive,
const char *kind);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char ** g_drive_enumerate_identifiers (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDriveStartStopType g_drive_get_start_stop_type (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_can_start (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_can_start_degraded (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_drive_start (GDrive *drive,
GDriveStartFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_start_finish (GDrive *drive,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_can_stop (GDrive *drive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_drive_stop (GDrive *drive,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_stop_finish (GDrive *drive,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_drive_eject_with_operation (GDrive *drive,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_drive_eject_with_operation_finish (GDrive *drive,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
const gchar *g_drive_get_sort_key (GDrive *drive);
G_END_DECLS
diff --git a/gio/gdtlsclientconnection.h b/gio/gdtlsclientconnection.h
index f772647fb0..f8ee1f49ec 100644
--- a/gio/gdtlsclientconnection.h
+++ b/gio/gdtlsclientconnection.h
@@ -50,25 +50,25 @@ struct _GDtlsClientConnectionInterface
GTypeInterface g_iface;
};
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GType g_dtls_client_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GDatagramBased *g_dtls_client_connection_new (GDatagramBased *base_socket,
GSocketConnectable *server_identity,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GTlsCertificateFlags g_dtls_client_connection_get_validation_flags (GDtlsClientConnection *conn);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_client_connection_set_validation_flags (GDtlsClientConnection *conn,
GTlsCertificateFlags flags);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GSocketConnectable *g_dtls_client_connection_get_server_identity (GDtlsClientConnection *conn);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_client_connection_set_server_identity (GDtlsClientConnection *conn,
GSocketConnectable *identity);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GList * g_dtls_client_connection_get_accepted_cas (GDtlsClientConnection *conn);
diff --git a/gio/gdtlsconnection.h b/gio/gdtlsconnection.h
index 6a02ee6e55..c7513ee9e8 100644
--- a/gio/gdtlsconnection.h
+++ b/gio/gdtlsconnection.h
@@ -107,70 +107,70 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
G_GNUC_END_IGNORE_DEPRECATIONS
};
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GType g_dtls_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_connection_set_database (GDtlsConnection *conn,
GTlsDatabase *database);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GTlsDatabase *g_dtls_connection_get_database (GDtlsConnection *conn);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_connection_set_certificate (GDtlsConnection *conn,
GTlsCertificate *certificate);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GTlsCertificate *g_dtls_connection_get_certificate (GDtlsConnection *conn);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_connection_set_interaction (GDtlsConnection *conn,
GTlsInteraction *interaction);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GTlsInteraction *g_dtls_connection_get_interaction (GDtlsConnection *conn);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GTlsCertificate *g_dtls_connection_get_peer_certificate (GDtlsConnection *conn);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GTlsCertificateFlags g_dtls_connection_get_peer_certificate_errors (GDtlsConnection *conn);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_connection_set_require_close_notify (GDtlsConnection *conn,
gboolean
require_close_notify);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_get_require_close_notify (GDtlsConnection *conn);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_60
+GIO_DEPRECATED_IN_2_60
void g_dtls_connection_set_rehandshake_mode (GDtlsConnection *conn,
GTlsRehandshakeMode mode);
-GLIB_DEPRECATED_IN_2_60
+GIO_DEPRECATED_IN_2_60
GTlsRehandshakeMode g_dtls_connection_get_rehandshake_mode (GDtlsConnection *conn);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_handshake (GDtlsConnection *conn,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_connection_handshake_async (GDtlsConnection *conn,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_handshake_finish (GDtlsConnection *conn,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_shutdown (GDtlsConnection *conn,
gboolean shutdown_read,
gboolean shutdown_write,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_connection_shutdown_async (GDtlsConnection *conn,
gboolean shutdown_read,
gboolean shutdown_write,
@@ -178,51 +178,51 @@ void g_dtls_connection_shutdown_async (GDtlsConnec
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_shutdown_finish (GDtlsConnection *conn,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_close (GDtlsConnection *conn,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
void g_dtls_connection_close_async (GDtlsConnection *conn,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_close_finish (GDtlsConnection *conn,
GAsyncResult *result,
GError **error);
/*< protected >*/
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_dtls_connection_emit_accept_certificate (GDtlsConnection *conn,
GTlsCertificate *peer_cert,
GTlsCertificateFlags errors);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_dtls_connection_set_advertised_protocols (GDtlsConnection *conn,
const gchar * const *protocols);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
const gchar * g_dtls_connection_get_negotiated_protocol (GDtlsConnection *conn);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
gboolean g_dtls_connection_get_channel_binding_data (GDtlsConnection *conn,
GTlsChannelBindingType type,
GByteArray *data,
GError **error);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GTlsProtocolVersion g_dtls_connection_get_protocol_version (GDtlsConnection *conn);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
gchar * g_dtls_connection_get_ciphersuite_name (GDtlsConnection *conn);
G_END_DECLS
diff --git a/gio/gdtlsserverconnection.h b/gio/gdtlsserverconnection.h
index b713b2c950..d46366060a 100644
--- a/gio/gdtlsserverconnection.h
+++ b/gio/gdtlsserverconnection.h
@@ -58,10 +58,10 @@ struct _GDtlsServerConnectionInterface
GTypeInterface g_iface;
};
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GType g_dtls_server_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GDatagramBased *g_dtls_server_connection_new (GDatagramBased *base_socket,
GTlsCertificate *certificate,
GError **error);
diff --git a/gio/gemblem.h b/gio/gemblem.h
index 246671e815..eb00c3b34f 100644
--- a/gio/gemblem.h
+++ b/gio/gemblem.h
@@ -45,17 +45,17 @@ G_BEGIN_DECLS
typedef struct _GEmblem GEmblem;
typedef struct _GEmblemClass GEmblemClass;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_emblem_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GEmblem *g_emblem_new (GIcon *icon);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GEmblem *g_emblem_new_with_origin (GIcon *icon,
GEmblemOrigin origin);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon *g_emblem_get_icon (GEmblem *emblem);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GEmblemOrigin g_emblem_get_origin (GEmblem *emblem);
G_END_DECLS
diff --git a/gio/gemblemedicon.h b/gio/gemblemedicon.h
index c19e99f506..1702b7b19d 100644
--- a/gio/gemblemedicon.h
+++ b/gio/gemblemedicon.h
@@ -62,20 +62,20 @@ struct _GEmblemedIconClass
GObjectClass parent_class;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_emblemed_icon_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon *g_emblemed_icon_new (GIcon *icon,
GEmblem *emblem);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon *g_emblemed_icon_get_icon (GEmblemedIcon *emblemed);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_emblemed_icon_add_emblem (GEmblemedIcon *emblemed,
GEmblem *emblem);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_emblemed_icon_clear_emblems (GEmblemedIcon *emblemed);
G_END_DECLS
diff --git a/gio/gfile.h b/gio/gfile.h
index 13ffed655e..141435f408 100644
--- a/gio/gfile.h
+++ b/gio/gfile.h
@@ -610,145 +610,145 @@ struct _GFileIface
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_new_for_path (const char *path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_new_for_uri (const char *uri);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_new_for_commandline_arg (const char *arg);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GFile * g_file_new_for_commandline_arg_and_cwd (const gchar *arg,
const gchar *cwd);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GFile * g_file_new_tmp (const char *tmpl,
GFileIOStream **iostream,
GError **error);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
void g_file_new_tmp_async (const char *tmpl,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
GFile * g_file_new_tmp_finish (GAsyncResult *result,
GFileIOStream **iostream,
GError **error);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
void g_file_new_tmp_dir_async (const char *tmpl,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
GFile * g_file_new_tmp_dir_finish (GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_parse_name (const char *parse_name);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
GFile * g_file_new_build_filename (const gchar *first_element,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_dup (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_file_hash (gconstpointer file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_equal (GFile *file1,
GFile *file2);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_get_basename (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_get_path (GFile *file);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
const char * g_file_peek_path (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_get_uri (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_get_parse_name (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_get_parent (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_has_parent (GFile *file,
GFile *parent);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_get_child (GFile *file,
const char *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_get_child_for_display_name (GFile *file,
const char *display_name,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_has_prefix (GFile *file,
GFile *prefix);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_get_relative_path (GFile *parent,
GFile *descendant);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_resolve_relative_path (GFile *file,
const char *relative_path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_is_native (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_has_uri_scheme (GFile *file,
const char *uri_scheme);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_get_uri_scheme (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInputStream * g_file_read (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_read_async (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInputStream * g_file_read_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileOutputStream * g_file_append_to (GFile *file,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileOutputStream * g_file_create (GFile *file,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileOutputStream * g_file_replace (GFile *file,
const char *etag,
gboolean make_backup,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_append_to_async (GFile *file,
GFileCreateFlags flags,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileOutputStream * g_file_append_to_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_create_async (GFile *file,
GFileCreateFlags flags,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileOutputStream * g_file_create_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_replace_async (GFile *file,
const char *etag,
gboolean make_backup,
@@ -757,48 +757,48 @@ void g_file_replace_async (GFile
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileOutputStream * g_file_replace_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileIOStream * g_file_open_readwrite (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_open_readwrite_async (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileIOStream * g_file_open_readwrite_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileIOStream * g_file_create_readwrite (GFile *file,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_create_readwrite_async (GFile *file,
GFileCreateFlags flags,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileIOStream * g_file_create_readwrite_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileIOStream * g_file_replace_readwrite (GFile *file,
const char *etag,
gboolean make_backup,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_replace_readwrite_async (GFile *file,
const char *etag,
gboolean make_backup,
@@ -807,24 +807,24 @@ void g_file_replace_readwrite_async (GFile
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileIOStream * g_file_replace_readwrite_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_query_exists (GFile *file,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileType g_file_query_file_type (GFile *file,
GFileQueryInfoFlags flags,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo * g_file_query_info (GFile *file,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_query_info_async (GFile *file,
const char *attributes,
GFileQueryInfoFlags flags,
@@ -832,47 +832,47 @@ void g_file_query_info_async (GFile
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo * g_file_query_info_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo * g_file_query_filesystem_info (GFile *file,
const char *attributes,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_query_filesystem_info_async (GFile *file,
const char *attributes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo * g_file_query_filesystem_info_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GMount * g_file_find_enclosing_mount (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_find_enclosing_mount_async (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GMount * g_file_find_enclosing_mount_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileEnumerator * g_file_enumerate_children (GFile *file,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_enumerate_children_async (GFile *file,
const char *attributes,
GFileQueryInfoFlags flags,
@@ -880,61 +880,61 @@ void g_file_enumerate_children_async (GFile
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileEnumerator * g_file_enumerate_children_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_set_display_name (GFile *file,
const char *display_name,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_set_display_name_async (GFile *file,
const char *display_name,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_set_display_name_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_delete (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_file_delete_async (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gboolean g_file_delete_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_trash (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_file_trash_async (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
gboolean g_file_trash_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_copy (GFile *source,
GFile *destination,
GFileCopyFlags flags,
@@ -942,7 +942,7 @@ gboolean g_file_copy (GFile
GFileProgressCallback progress_callback,
gpointer progress_callback_data,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_copy_async (GFile *source,
GFile *destination,
GFileCopyFlags flags,
@@ -952,11 +952,11 @@ void g_file_copy_async (GFile
gpointer progress_callback_data,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_copy_finish (GFile *file,
GAsyncResult *res,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_move (GFile *source,
GFile *destination,
GFileCopyFlags flags,
@@ -964,7 +964,7 @@ gboolean g_file_move (GFile
GFileProgressCallback progress_callback,
gpointer progress_callback_data,
GError **error);
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
void g_file_move_async (GFile *source,
GFile
*destination,
GFileCopyFlags flags,
@@ -974,54 +974,54 @@ void g_file_move_async (GFile
gpointer
progress_callback_data,
GAsyncReadyCallback callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
gboolean g_file_move_finish (GFile *file,
GAsyncResult *result,
GError
**error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_make_directory (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_file_make_directory_async (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
gboolean g_file_make_directory_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_make_directory_with_parents (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_make_symbolic_link (GFile *file,
const char *symlink_value,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
void g_file_make_symbolic_link_async (GFile *file,
const char *symlink_value,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
gboolean g_file_make_symbolic_link_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeInfoList *g_file_query_settable_attributes (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeInfoList *g_file_query_writable_namespaces (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attribute (GFile *file,
const char *attribute,
GFileAttributeType type,
@@ -1029,13 +1029,13 @@ gboolean g_file_set_attribute (GFile
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attributes_from_info (GFile *file,
GFileInfo *info,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_set_attributes_async (GFile *file,
GFileInfo *info,
GFileQueryInfoFlags flags,
@@ -1043,127 +1043,127 @@ void g_file_set_attributes_async (GFile
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attributes_finish (GFile *file,
GAsyncResult *result,
GFileInfo **info,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attribute_string (GFile *file,
const char *attribute,
const char *value,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attribute_byte_string (GFile *file,
const char *attribute,
const char *value,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attribute_uint32 (GFile *file,
const char *attribute,
guint32 value,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attribute_int32 (GFile *file,
const char *attribute,
gint32 value,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attribute_uint64 (GFile *file,
const char *attribute,
guint64 value,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_set_attribute_int64 (GFile *file,
const char *attribute,
gint64 value,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_mount_enclosing_volume (GFile *location,
GMountMountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_mount_enclosing_volume_finish (GFile *location,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_mount_mountable (GFile *file,
GMountMountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_mount_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation)
+GIO_DEPRECATED_FOR(g_file_unmount_mountable_with_operation)
void g_file_unmount_mountable (GFile *file,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish)
+GIO_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish)
gboolean g_file_unmount_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_unmount_mountable_with_operation (GFile *file,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_unmount_mountable_with_operation_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation)
+GIO_DEPRECATED_FOR(g_file_eject_mountable_with_operation)
void g_file_eject_mountable (GFile *file,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish)
+GIO_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish)
gboolean g_file_eject_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_eject_mountable_with_operation (GFile *file,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_eject_mountable_with_operation_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_68
+GIO_AVAILABLE_IN_2_68
char * g_file_build_attribute_list_for_copy (GFile *file,
GFileCopyFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_copy_attributes (GFile *source,
GFile *destination,
GFileCopyFlags flags,
@@ -1171,23 +1171,23 @@ gboolean g_file_copy_attributes (GFile
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileMonitor* g_file_monitor_directory (GFile *file,
GFileMonitorFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileMonitor* g_file_monitor_file (GFile *file,
GFileMonitorFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileMonitor* g_file_monitor (GFile *file,
GFileMonitorFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
gboolean g_file_measure_disk_usage (GFile *file,
GFileMeasureFlags flags,
GCancellable *cancellable,
@@ -1198,7 +1198,7 @@ gboolean g_file_measure_disk_usage (GFile
guint64 *num_files,
GError **error);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_file_measure_disk_usage_async (GFile *file,
GFileMeasureFlags flags,
gint io_priority,
@@ -1208,7 +1208,7 @@ void g_file_measure_disk_usage_async (GFile
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
gboolean g_file_measure_disk_usage_finish (GFile *file,
GAsyncResult *result,
guint64 *disk_usage,
@@ -1216,89 +1216,89 @@ gboolean g_file_measure_disk_usage_finish (GFile
guint64 *num_files,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_start_mountable (GFile *file,
GDriveStartFlags flags,
GMountOperation *start_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_start_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_stop_mountable (GFile *file,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_stop_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_poll_mountable (GFile *file,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_poll_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
/* Utilities */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GAppInfo *g_file_query_default_handler (GFile *file,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_file_query_default_handler_async (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
GAppInfo *g_file_query_default_handler_finish (GFile *file,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_load_contents (GFile *file,
GCancellable *cancellable,
char **contents,
gsize *length,
char **etag_out,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_load_contents_async (GFile *file,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_load_contents_finish (GFile *file,
GAsyncResult *res,
char **contents,
gsize *length,
char **etag_out,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_load_partial_contents_async (GFile *file,
GCancellable *cancellable,
GFileReadMoreCallback read_more_callback,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_load_partial_contents_finish (GFile *file,
GAsyncResult *res,
char **contents,
gsize *length,
char **etag_out,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_replace_contents (GFile *file,
const char *contents,
gsize length,
@@ -1308,7 +1308,7 @@ gboolean g_file_replace_contents (GFile *file,
char **new_etag,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_replace_contents_async (GFile *file,
const char *contents,
gsize length,
@@ -1318,7 +1318,7 @@ void g_file_replace_contents_async (GFile *file,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_file_replace_contents_bytes_async (GFile *file,
GBytes *contents,
const char *etag,
@@ -1327,26 +1327,26 @@ void g_file_replace_contents_bytes_async (GFile *file,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_replace_contents_finish (GFile *file,
GAsyncResult *res,
char **new_etag,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_supports_thread_contexts (GFile *file);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
GBytes *g_file_load_bytes (GFile *file,
GCancellable *cancellable,
gchar **etag_out,
GError **error);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
void g_file_load_bytes_async (GFile *file,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
GBytes *g_file_load_bytes_finish (GFile *file,
GAsyncResult *result,
gchar **etag_out,
diff --git a/gio/gfileattribute.h b/gio/gfileattribute.h
index f139c1e821..0ce6098192 100644
--- a/gio/gfileattribute.h
+++ b/gio/gfileattribute.h
@@ -61,21 +61,21 @@ struct _GFileAttributeInfoList
};
#define G_TYPE_FILE_ATTRIBUTE_INFO_LIST (g_file_attribute_info_list_get_type ())
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_attribute_info_list_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeInfoList * g_file_attribute_info_list_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeInfoList * g_file_attribute_info_list_ref (GFileAttributeInfoList *list);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_attribute_info_list_unref (GFileAttributeInfoList *list);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeInfoList * g_file_attribute_info_list_dup (GFileAttributeInfoList *list);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const GFileAttributeInfo *g_file_attribute_info_list_lookup (GFileAttributeInfoList *list,
const char *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_attribute_info_list_add (GFileAttributeInfoList *list,
const char *name,
GFileAttributeType type,
diff --git a/gio/gfiledescriptorbased.h b/gio/gfiledescriptorbased.h
index f9cf35725a..46fdbf5254 100644
--- a/gio/gfiledescriptorbased.h
+++ b/gio/gfiledescriptorbased.h
@@ -55,10 +55,10 @@ struct _GFileDescriptorBasedIface
int (*get_fd) (GFileDescriptorBased *fd_based);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_descriptor_based_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_file_descriptor_based_get_fd (GFileDescriptorBased *fd_based);
G_END_DECLS
diff --git a/gio/gfileenumerator.h b/gio/gfileenumerator.h
index 68d4b94bbf..eddb580841 100644
--- a/gio/gfileenumerator.h
+++ b/gio/gfileenumerator.h
@@ -96,52 +96,52 @@ struct _GFileEnumeratorClass
void (*_g_reserved7) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_enumerator_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_file_enumerator_next_file (GFileEnumerator *enumerator,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_enumerator_close (GFileEnumerator *enumerator,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_enumerator_next_files_async (GFileEnumerator *enumerator,
int num_files,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_file_enumerator_next_files_finish (GFileEnumerator *enumerator,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_enumerator_close_async (GFileEnumerator *enumerator,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_enumerator_close_finish (GFileEnumerator *enumerator,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_enumerator_is_closed (GFileEnumerator *enumerator);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_enumerator_has_pending (GFileEnumerator *enumerator);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_enumerator_set_pending (GFileEnumerator *enumerator,
gboolean pending);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_enumerator_get_container (GFileEnumerator *enumerator);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GFile * g_file_enumerator_get_child (GFileEnumerator *enumerator,
GFileInfo *info);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gboolean g_file_enumerator_iterate (GFileEnumerator *direnum,
GFileInfo **out_info,
GFile **out_child,
diff --git a/gio/gfileicon.h b/gio/gfileicon.h
index a3229cfabd..230acdf246 100644
--- a/gio/gfileicon.h
+++ b/gio/gfileicon.h
@@ -45,13 +45,13 @@ G_BEGIN_DECLS
**/
typedef struct _GFileIconClass GFileIconClass;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_icon_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_file_icon_new (GFile *file);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_file_icon_get_file (GFileIcon *icon);
G_END_DECLS
diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 28bddfebcd..b8123c34ed 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -1116,246 +1116,246 @@ typedef struct _GFileInfoClass GFileInfoClass;
**/
#define G_FILE_ATTRIBUTE_RECENT_MODIFIED "recent::modified" /* int64 (time_t) */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo * g_file_info_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo * g_file_info_dup (GFileInfo *other);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_copy_into (GFileInfo *src_info,
GFileInfo *dest_info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_has_attribute (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_has_namespace (GFileInfo *info,
const char *name_space);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char ** g_file_info_list_attributes (GFileInfo *info,
const char *name_space);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_get_attribute_data (GFileInfo *info,
const char *attribute,
GFileAttributeType *type,
gpointer *value_pp,
GFileAttributeStatus *status);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeType g_file_info_get_attribute_type (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_remove_attribute (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeStatus g_file_info_get_attribute_status (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_set_attribute_status (GFileInfo *info,
const char *attribute,
GFileAttributeStatus status);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_info_get_attribute_as_string (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_attribute_string (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_attribute_byte_string (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_get_attribute_boolean (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint32 g_file_info_get_attribute_uint32 (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint32 g_file_info_get_attribute_int32 (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint64 g_file_info_get_attribute_uint64 (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint64 g_file_info_get_attribute_int64 (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GObject * g_file_info_get_attribute_object (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char ** g_file_info_get_attribute_stringv (GFileInfo *info,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute (GFileInfo *info,
const char *attribute,
GFileAttributeType type,
gpointer value_p);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_string (GFileInfo *info,
const char *attribute,
const char *attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_byte_string (GFileInfo *info,
const char *attribute,
const char *attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_boolean (GFileInfo *info,
const char *attribute,
gboolean attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_uint32 (GFileInfo *info,
const char *attribute,
guint32 attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_int32 (GFileInfo *info,
const char *attribute,
gint32 attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_uint64 (GFileInfo *info,
const char *attribute,
guint64 attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_int64 (GFileInfo *info,
const char *attribute,
gint64 attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_object (GFileInfo *info,
const char *attribute,
GObject *attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_stringv (GFileInfo *info,
const char *attribute,
char **attr_value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_clear_status (GFileInfo *info);
/* Helper getters: */
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GDateTime * g_file_info_get_deletion_date (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileType g_file_info_get_file_type (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_get_is_hidden (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_get_is_backup (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_info_get_is_symlink (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_name (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_display_name (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_edit_name (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_file_info_get_icon (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_file_info_get_symbolic_icon (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_content_type (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
goffset g_file_info_get_size (GFileInfo *info);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_62_FOR(g_file_info_get_modification_date_time)
+GIO_DEPRECATED_IN_2_62_FOR(g_file_info_get_modification_date_time)
void g_file_info_get_modification_time (GFileInfo *info,
GTimeVal *result);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_2_62
+GIO_AVAILABLE_IN_2_62
GDateTime * g_file_info_get_modification_date_time (GFileInfo *info);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GDateTime * g_file_info_get_access_date_time (GFileInfo *info);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GDateTime * g_file_info_get_creation_date_time (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_symlink_target (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_info_get_etag (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint32 g_file_info_get_sort_order (GFileInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_attribute_mask (GFileInfo *info,
GFileAttributeMatcher *mask);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_unset_attribute_mask (GFileInfo *info);
/* Helper setters: */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_file_type (GFileInfo *info,
GFileType type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_is_hidden (GFileInfo *info,
gboolean is_hidden);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_is_symlink (GFileInfo *info,
gboolean is_symlink);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_name (GFileInfo *info,
const char *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_display_name (GFileInfo *info,
const char *display_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_edit_name (GFileInfo *info,
const char *edit_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_icon (GFileInfo *info,
GIcon *icon);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_symbolic_icon (GFileInfo *info,
GIcon *icon);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_content_type (GFileInfo *info,
const char *content_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_size (GFileInfo *info,
goffset size);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_62_FOR(g_file_info_set_modification_date_time)
+GIO_DEPRECATED_IN_2_62_FOR(g_file_info_set_modification_date_time)
void g_file_info_set_modification_time (GFileInfo *info,
GTimeVal *mtime);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_2_62
+GIO_AVAILABLE_IN_2_62
void g_file_info_set_modification_date_time (GFileInfo *info,
GDateTime *mtime);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
void g_file_info_set_access_date_time (GFileInfo *info,
GDateTime *atime);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
void g_file_info_set_creation_date_time (GFileInfo *info,
GDateTime *creation_time);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_symlink_target (GFileInfo *info,
const char *symlink_target);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_info_set_sort_order (GFileInfo *info,
gint32 sort_order);
#define G_TYPE_FILE_ATTRIBUTE_MATCHER (g_file_attribute_matcher_get_type ())
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_attribute_matcher_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeMatcher *g_file_attribute_matcher_new (const char *attributes);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeMatcher *g_file_attribute_matcher_ref (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_attribute_matcher_unref (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileAttributeMatcher *g_file_attribute_matcher_subtract (GFileAttributeMatcher *matcher,
GFileAttributeMatcher *subtract);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_attribute_matcher_matches (GFileAttributeMatcher *matcher,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_attribute_matcher_matches_only (GFileAttributeMatcher *matcher,
const char *attribute);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher,
const char *ns);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
char * g_file_attribute_matcher_to_string (GFileAttributeMatcher *matcher);
G_END_DECLS
diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h
index 83a000fd0a..54626951db 100644
--- a/gio/gfileinputstream.h
+++ b/gio/gfileinputstream.h
@@ -91,22 +91,22 @@ struct _GFileInputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_file_input_stream_query_info (GFileInputStream *stream,
const char *attributes,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_input_stream_query_info_async (GFileInputStream *stream,
const char *attributes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream *stream,
GAsyncResult *result,
GError **error);
diff --git a/gio/gfileiostream.h b/gio/gfileiostream.h
index 2db4e2b04d..c1c70c5610 100644
--- a/gio/gfileiostream.h
+++ b/gio/gfileiostream.h
@@ -96,26 +96,26 @@ struct _GFileIOStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_io_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_file_io_stream_query_info (GFileIOStream *stream,
const char *attributes,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_io_stream_query_info_async (GFileIOStream *stream,
const char *attributes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_file_io_stream_query_info_finish (GFileIOStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_io_stream_get_etag (GFileIOStream *stream);
G_END_DECLS
diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h
index 06cd2d77d4..b677efc910 100644
--- a/gio/gfilemonitor.h
+++ b/gio/gfilemonitor.h
@@ -76,20 +76,20 @@ struct _GFileMonitorClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_monitor_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_monitor_cancel (GFileMonitor *monitor);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_file_monitor_is_cancelled (GFileMonitor *monitor);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_monitor_set_rate_limit (GFileMonitor *monitor,
gint limit_msecs);
/* For implementations */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_monitor_emit_event (GFileMonitor *monitor,
GFile *child,
GFile *other_file,
diff --git a/gio/gfilenamecompleter.h b/gio/gfilenamecompleter.h
index 95ecae3078..b105e49ce9 100644
--- a/gio/gfilenamecompleter.h
+++ b/gio/gfilenamecompleter.h
@@ -60,19 +60,19 @@ struct _GFilenameCompleterClass
void (*_g_reserved3) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_filename_completer_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFilenameCompleter *g_filename_completer_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
const char *initial_text);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char ** g_filename_completer_get_completions (GFilenameCompleter *completer,
const char *initial_text);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_filename_completer_set_dirs_only (GFilenameCompleter *completer,
gboolean dirs_only);
diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h
index 5af8eabcdc..576b21fb83 100644
--- a/gio/gfileoutputstream.h
+++ b/gio/gfileoutputstream.h
@@ -96,27 +96,27 @@ struct _GFileOutputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_file_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_file_output_stream_query_info (GFileOutputStream *stream,
const char *attributes,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_file_output_stream_query_info_async (GFileOutputStream *stream,
const char *attributes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_file_output_stream_get_etag (GFileOutputStream *stream);
G_END_DECLS
diff --git a/gio/gfilterinputstream.h b/gio/gfilterinputstream.h
index 09a087a7ac..df6032c27e 100644
--- a/gio/gfilterinputstream.h
+++ b/gio/gfilterinputstream.h
@@ -65,13 +65,13 @@ struct _GFilterInputStreamClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_filter_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream * g_filter_input_stream_get_base_stream (GFilterInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream,
gboolean close_base);
diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h
index 5fc6b82792..472f9d80db 100644
--- a/gio/gfilteroutputstream.h
+++ b/gio/gfilteroutputstream.h
@@ -65,13 +65,13 @@ struct _GFilterOutputStreamClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_filter_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream * g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
gboolean close_base);
diff --git a/gio/gicon.h b/gio/gicon.h
index 22e7e5ef51..58cf74a246 100644
--- a/gio/gicon.h
+++ b/gio/gicon.h
@@ -80,23 +80,23 @@ struct _GIconIface
GVariant * (* serialize) (GIcon *icon);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_icon_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_icon_hash (gconstpointer icon);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_icon_equal (GIcon *icon1,
GIcon *icon2);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_icon_to_string (GIcon *icon);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon *g_icon_new_for_string (const gchar *str,
GError **error);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
GVariant * g_icon_serialize (GIcon *icon);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
GIcon * g_icon_deserialize (GVariant *value);
G_END_DECLS
diff --git a/gio/ginetaddress.h b/gio/ginetaddress.h
index 5a1b7da699..ea503a9278 100644
--- a/gio/ginetaddress.h
+++ b/gio/ginetaddress.h
@@ -58,66 +58,66 @@ struct _GInetAddressClass
const guint8 * (*to_bytes) (GInetAddress *address);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_inet_address_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInetAddress * g_inet_address_new_from_string (const gchar *string);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInetAddress * g_inet_address_new_from_bytes (const guint8 *bytes,
GSocketFamily family);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInetAddress * g_inet_address_new_loopback (GSocketFamily family);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInetAddress * g_inet_address_new_any (GSocketFamily family);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_equal (GInetAddress *address,
GInetAddress *other_address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar * g_inet_address_to_string (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const guint8 * g_inet_address_to_bytes (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_inet_address_get_native_size (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketFamily g_inet_address_get_family (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_any (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_loopback (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_link_local (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_site_local (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_multicast (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_mc_global (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_mc_link_local (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_mc_node_local (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_mc_org_local (GInetAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_inet_address_get_is_mc_site_local (GInetAddress *address);
G_END_DECLS
diff --git a/gio/ginetaddressmask.h b/gio/ginetaddressmask.h
index f4a9769e91..25cce7500c 100644
--- a/gio/ginetaddressmask.h
+++ b/gio/ginetaddressmask.h
@@ -53,31 +53,31 @@ struct _GInetAddressMaskClass
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_inet_address_mask_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GInetAddressMask *g_inet_address_mask_new (GInetAddress *addr,
guint length,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GInetAddressMask *g_inet_address_mask_new_from_string (const gchar *mask_string,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gchar *g_inet_address_mask_to_string (GInetAddressMask *mask);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GSocketFamily g_inet_address_mask_get_family (GInetAddressMask *mask);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GInetAddress *g_inet_address_mask_get_address (GInetAddressMask *mask);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint g_inet_address_mask_get_length (GInetAddressMask *mask);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_inet_address_mask_matches (GInetAddressMask *mask,
GInetAddress *address);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_inet_address_mask_equal (GInetAddressMask *mask,
GInetAddressMask *mask2);
diff --git a/gio/ginetsocketaddress.h b/gio/ginetsocketaddress.h
index c0c418d03f..a983abef2b 100644
--- a/gio/ginetsocketaddress.h
+++ b/gio/ginetsocketaddress.h
@@ -55,24 +55,24 @@ struct _GInetSocketAddressClass
GSocketAddressClass parent_class;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_inet_socket_address_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_inet_socket_address_new (GInetAddress *address,
guint16 port);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSocketAddress *g_inet_socket_address_new_from_string (const char *address,
guint port);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInetAddress * g_inet_socket_address_get_address (GInetSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_inet_socket_address_get_port (GInetSocketAddress *address);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint32 g_inet_socket_address_get_flowinfo (GInetSocketAddress *address);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint32 g_inet_socket_address_get_scope_id (GInetSocketAddress *address);
G_END_DECLS
diff --git a/gio/ginitable.h b/gio/ginitable.h
index 981c3c98ef..9eb995c482 100644
--- a/gio/ginitable.h
+++ b/gio/ginitable.h
@@ -68,15 +68,15 @@ struct _GInitableIface
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_initable_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_initable_init (GInitable *initable,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gpointer g_initable_new (GType object_type,
GCancellable *cancellable,
GError **error,
@@ -85,7 +85,7 @@ gpointer g_initable_new (GType object_type,
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_initable_init)
+GIO_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_initable_init)
gpointer g_initable_newv (GType object_type,
guint n_parameters,
GParameter *parameters,
@@ -94,7 +94,7 @@ gpointer g_initable_newv (GType object_type,
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GObject* g_initable_new_valist (GType object_type,
const gchar *first_property_name,
va_list var_args,
diff --git a/gio/ginputstream.h b/gio/ginputstream.h
index deb139b011..a7be7689ca 100644
--- a/gio/ginputstream.h
+++ b/gio/ginputstream.h
@@ -111,37 +111,37 @@ struct _GInputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_input_stream_read (GInputStream *stream,
void *buffer,
gsize count,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_input_stream_read_all (GInputStream *stream,
void *buffer,
gsize count,
gsize *bytes_read,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GBytes *g_input_stream_read_bytes (GInputStream *stream,
gsize count,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_input_stream_skip (GInputStream *stream,
gsize count,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_input_stream_close (GInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_input_stream_read_async (GInputStream *stream,
void *buffer,
gsize count,
@@ -149,12 +149,12 @@ void g_input_stream_read_async (GInputStream *stream,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_input_stream_read_finish (GInputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_input_stream_read_all_async (GInputStream *stream,
void *buffer,
gsize count,
@@ -162,55 +162,55 @@ void g_input_stream_read_all_async (GInputStream *stream,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gboolean g_input_stream_read_all_finish (GInputStream *stream,
GAsyncResult *result,
gsize *bytes_read,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_input_stream_read_bytes_async (GInputStream *stream,
gsize count,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GBytes *g_input_stream_read_bytes_finish (GInputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_input_stream_skip_async (GInputStream *stream,
gsize count,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_input_stream_skip_finish (GInputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_input_stream_close_async (GInputStream *stream,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_input_stream_close_finish (GInputStream *stream,
GAsyncResult *result,
GError **error);
/* For implementations: */
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_input_stream_is_closed (GInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_input_stream_has_pending (GInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_input_stream_set_pending (GInputStream *stream,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_input_stream_clear_pending (GInputStream *stream);
G_END_DECLS
diff --git a/gio/gioenums.h b/gio/gioenums.h
index 24b67df812..7fd74a43ea 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -580,7 +580,7 @@ typedef enum {
G_IO_ERROR_CONNECTION_CLOSED = G_IO_ERROR_BROKEN_PIPE,
G_IO_ERROR_NOT_CONNECTED,
G_IO_ERROR_MESSAGE_TOO_LARGE,
- G_IO_ERROR_NO_SUCH_DEVICE GLIB_AVAILABLE_ENUMERATOR_IN_2_74,
+ G_IO_ERROR_NO_SUCH_DEVICE GIO_AVAILABLE_ENUMERATOR_IN_2_74,
} GIOErrorEnum;
@@ -1042,7 +1042,7 @@ typedef enum
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2),
G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = (1<<3),
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION = (1<<4),
- G_DBUS_PROXY_FLAGS_NO_MATCH_RULE GLIB_AVAILABLE_ENUMERATOR_IN_2_72 = (1<<5)
+ G_DBUS_PROXY_FLAGS_NO_MATCH_RULE GIO_AVAILABLE_ENUMERATOR_IN_2_72 = (1<<5)
} GDBusProxyFlags;
/**
@@ -1235,8 +1235,8 @@ typedef enum {
G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<2),
G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION = (1<<3),
G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING = (1<<4),
- G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GLIB_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<5),
- G_DBUS_CONNECTION_FLAGS_CROSS_NAMESPACE GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = (1<<6)
+ G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GIO_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<5),
+ G_DBUS_CONNECTION_FLAGS_CROSS_NAMESPACE GIO_AVAILABLE_ENUMERATOR_IN_2_74 = (1<<6)
} GDBusConnectionFlags;
/**
@@ -1399,7 +1399,7 @@ typedef enum
G_DBUS_SERVER_FLAGS_NONE = 0,
G_DBUS_SERVER_FLAGS_RUN_IN_THREAD = (1<<0),
G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<1),
- G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GLIB_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<2)
+ G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER GIO_AVAILABLE_ENUMERATOR_IN_2_68 = (1<<2)
} GDBusServerFlags;
/**
@@ -1534,8 +1534,8 @@ typedef enum
**/
typedef enum /*< prefix=G_APPLICATION >*/
{
- G_APPLICATION_FLAGS_NONE GLIB_DEPRECATED_ENUMERATOR_IN_2_74_FOR(G_APPLICATION_DEFAULT_FLAGS),
- G_APPLICATION_DEFAULT_FLAGS GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
+ G_APPLICATION_FLAGS_NONE GIO_DEPRECATED_ENUMERATOR_IN_2_74_FOR(G_APPLICATION_DEFAULT_FLAGS),
+ G_APPLICATION_DEFAULT_FLAGS GIO_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
G_APPLICATION_IS_SERVICE = (1 << 0),
G_APPLICATION_IS_LAUNCHER = (1 << 1),
@@ -1623,7 +1623,7 @@ typedef enum {
* Since: 2.28
*/
typedef enum {
- G_TLS_CERTIFICATE_NO_FLAGS GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
+ G_TLS_CERTIFICATE_NO_FLAGS GIO_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
G_TLS_CERTIFICATE_UNKNOWN_CA = (1 << 0),
G_TLS_CERTIFICATE_BAD_IDENTITY = (1 << 1),
G_TLS_CERTIFICATE_NOT_ACTIVATED = (1 << 2),
@@ -1670,11 +1670,11 @@ typedef enum {
*
* Since: 2.66
*/
-GLIB_AVAILABLE_TYPE_IN_2_66
+GIO_AVAILABLE_TYPE_IN_2_66
typedef enum {
G_TLS_CHANNEL_BINDING_TLS_UNIQUE,
G_TLS_CHANNEL_BINDING_TLS_SERVER_END_POINT,
- G_TLS_CHANNEL_BINDING_TLS_EXPORTER GLIB_AVAILABLE_ENUMERATOR_IN_2_74,
+ G_TLS_CHANNEL_BINDING_TLS_EXPORTER GIO_AVAILABLE_ENUMERATOR_IN_2_74,
} GTlsChannelBindingType;
/**
@@ -1701,7 +1701,7 @@ typedef enum {
*
* Since: 2.66
*/
-GLIB_AVAILABLE_TYPE_IN_2_66
+GIO_AVAILABLE_TYPE_IN_2_66
typedef enum {
G_TLS_CHANNEL_BINDING_ERROR_NOT_IMPLEMENTED,
G_TLS_CHANNEL_BINDING_ERROR_INVALID_STATE,
@@ -1729,7 +1729,7 @@ typedef enum {
G_TLS_REHANDSHAKE_NEVER,
G_TLS_REHANDSHAKE_SAFELY,
G_TLS_REHANDSHAKE_UNSAFELY
-} GTlsRehandshakeMode GLIB_DEPRECATED_TYPE_IN_2_60;
+} GTlsRehandshakeMode GIO_DEPRECATED_TYPE_IN_2_60;
/**
* GTlsPasswordFlags:
diff --git a/gio/gioenumtypes.h.template b/gio/gioenumtypes.h.template
index dc51b90cf9..c75a3b4597 100644
--- a/gio/gioenumtypes.h.template
+++ b/gio/gioenumtypes.h.template
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
/*** END file-production ***/
/*** BEGIN value-header ***/
-GLIB_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
+GIO_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
/*** END value-header ***/
diff --git a/gio/gioerror.h b/gio/gioerror.h
index 958c4a9317..71ccdb1721 100644
--- a/gio/gioerror.h
+++ b/gio/gioerror.h
@@ -41,15 +41,15 @@ G_BEGIN_DECLS
**/
#define G_IO_ERROR g_io_error_quark()
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GQuark g_io_error_quark (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOErrorEnum g_io_error_from_errno (gint err_no);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
GIOErrorEnum g_io_error_from_file_error (GFileError file_error);
#ifdef G_OS_WIN32
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOErrorEnum g_io_error_from_win32_error (gint error_code);
#endif
diff --git a/gio/giomodule.h b/gio/giomodule.h
index 45a7c26e4b..1c53aa8ee4 100644
--- a/gio/giomodule.h
+++ b/gio/giomodule.h
@@ -34,11 +34,11 @@ G_BEGIN_DECLS
typedef struct _GIOModuleScope GIOModuleScope;
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
GIOModuleScope * g_io_module_scope_new (GIOModuleScopeFlags flags);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
void g_io_module_scope_free (GIOModuleScope *scope);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
void g_io_module_scope_block (GIOModuleScope *scope,
const gchar *basename);
@@ -56,50 +56,50 @@ void g_io_module_scope_block (GIOModuleScope *scope,
**/
typedef struct _GIOModuleClass GIOModuleClass;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_io_module_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOModule *g_io_module_new (const gchar *filename);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_io_modules_scan_all_in_directory (const char *dirname);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_io_modules_load_all_in_directory (const gchar *dirname);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
void g_io_modules_scan_all_in_directory_with_scope (const gchar *dirname,
GIOModuleScope *scope);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
GList *g_io_modules_load_all_in_directory_with_scope (const gchar *dirname,
GIOModuleScope *scope);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOExtensionPoint *g_io_extension_point_register (const char *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOExtensionPoint *g_io_extension_point_lookup (const char *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_io_extension_point_set_required_type (GIOExtensionPoint *extension_point,
GType type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_io_extension_point_get_required_type (GIOExtensionPoint *extension_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_io_extension_point_get_extensions (GIOExtensionPoint *extension_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOExtension * g_io_extension_point_get_extension_by_name (GIOExtensionPoint *extension_point,
const char *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOExtension * g_io_extension_point_implement (const char *extension_point_name,
GType type,
const char *extension_name,
gint priority);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_io_extension_get_type (GIOExtension *extension);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_io_extension_get_name (GIOExtension *extension);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_io_extension_get_priority (GIOExtension *extension);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTypeClass* g_io_extension_ref_class (GIOExtension *extension);
@@ -123,7 +123,7 @@ GTypeClass* g_io_extension_ref_class (GIOExtension
* statically. The old symbol names continue to be supported, but cannot be used
* for static builds.
**/
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_io_module_load (GIOModule *module);
/**
@@ -143,7 +143,7 @@ void g_io_module_load (GIOModule *module);
* statically. The old symbol names continue to be supported, but cannot be used
* for static builds.
**/
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_io_module_unload (GIOModule *module);
/**
@@ -187,7 +187,7 @@ void g_io_module_unload (GIOModule *module);
*
* Since: 2.24
**/
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char **g_io_module_query (void);
G_END_DECLS
diff --git a/gio/gioscheduler.h b/gio/gioscheduler.h
index ef51d5a0e9..52162dce8c 100644
--- a/gio/gioscheduler.h
+++ b/gio/gioscheduler.h
@@ -32,20 +32,20 @@
G_BEGIN_DECLS
-GLIB_DEPRECATED_IN_2_36_FOR ("GThreadPool or g_task_run_in_thread")
+GIO_DEPRECATED_IN_2_36_FOR ("GThreadPool or g_task_run_in_thread")
void g_io_scheduler_push_job (GIOSchedulerJobFunc job_func,
gpointer user_data,
GDestroyNotify notify,
gint io_priority,
GCancellable *cancellable);
-GLIB_DEPRECATED_IN_2_36
+GIO_DEPRECATED_IN_2_36
void g_io_scheduler_cancel_all_jobs (void);
-GLIB_DEPRECATED_IN_2_36_FOR (g_main_context_invoke)
+GIO_DEPRECATED_IN_2_36_FOR (g_main_context_invoke)
gboolean g_io_scheduler_job_send_to_mainloop (GIOSchedulerJob *job,
GSourceFunc func,
gpointer user_data,
GDestroyNotify notify);
-GLIB_DEPRECATED_IN_2_36_FOR (g_main_context_invoke)
+GIO_DEPRECATED_IN_2_36_FOR (g_main_context_invoke)
void g_io_scheduler_job_send_to_mainloop_async (GIOSchedulerJob *job,
GSourceFunc func,
gpointer user_data,
diff --git a/gio/giostream.h b/gio/giostream.h
index f862b48bde..52881c7865 100644
--- a/gio/giostream.h
+++ b/gio/giostream.h
@@ -85,15 +85,15 @@ struct _GIOStreamClass
void (*_g_reserved10) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_io_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream * g_io_stream_get_input_stream (GIOStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream *g_io_stream_get_output_stream (GIOStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_io_stream_splice_async (GIOStream *stream1,
GIOStream *stream2,
GIOStreamSpliceFlags flags,
@@ -102,34 +102,34 @@ void g_io_stream_splice_async (GIOStream *stream1,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_io_stream_splice_finish (GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_io_stream_close (GIOStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_io_stream_close_async (GIOStream *stream,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_io_stream_close_finish (GIOStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_io_stream_is_closed (GIOStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_io_stream_has_pending (GIOStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_io_stream_set_pending (GIOStream *stream,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_io_stream_clear_pending (GIOStream *stream);
G_END_DECLS
diff --git a/gio/glistmodel.h b/gio/glistmodel.h
index f2e0618a69..a96e3cea00 100644
--- a/gio/glistmodel.h
+++ b/gio/glistmodel.h
@@ -34,7 +34,7 @@
G_BEGIN_DECLS
#define G_TYPE_LIST_MODEL g_list_model_get_type ()
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
G_DECLARE_INTERFACE(GListModel, g_list_model, G, LIST_MODEL, GObject)
struct _GListModelInterface
@@ -49,21 +49,21 @@ struct _GListModelInterface
guint position);
};
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GType g_list_model_get_item_type (GListModel *list);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
guint g_list_model_get_n_items (GListModel *list);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gpointer g_list_model_get_item (GListModel *list,
guint position);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GObject * g_list_model_get_object (GListModel *list,
guint position);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_list_model_items_changed (GListModel *list,
guint position,
guint removed,
diff --git a/gio/gliststore.h b/gio/gliststore.h
index 7583632de2..958ca60d21 100644
--- a/gio/gliststore.h
+++ b/gio/gliststore.h
@@ -34,58 +34,58 @@
G_BEGIN_DECLS
#define G_TYPE_LIST_STORE (g_list_store_get_type ())
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
G_DECLARE_FINAL_TYPE(GListStore, g_list_store, G, LIST_STORE, GObject)
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GListStore * g_list_store_new (GType item_type);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_list_store_insert (GListStore *store,
guint position,
gpointer item);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
guint g_list_store_insert_sorted (GListStore *store,
gpointer item,
GCompareDataFunc compare_func,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_list_store_sort (GListStore *store,
GCompareDataFunc compare_func,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_list_store_append (GListStore *store,
gpointer item);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_list_store_remove (GListStore *store,
guint position);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_list_store_remove_all (GListStore *store);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_list_store_splice (GListStore *store,
guint position,
guint n_removals,
gpointer *additions,
guint n_additions);
-GLIB_AVAILABLE_IN_2_64
+GIO_AVAILABLE_IN_2_64
gboolean g_list_store_find (GListStore *store,
gpointer item,
guint *position);
-GLIB_AVAILABLE_IN_2_64
+GIO_AVAILABLE_IN_2_64
gboolean g_list_store_find_with_equal_func (GListStore *store,
gpointer item,
GEqualFunc equal_func,
guint *position);
-GLIB_AVAILABLE_IN_2_74
+GIO_AVAILABLE_IN_2_74
gboolean g_list_store_find_with_equal_func_full (GListStore *store,
gpointer item,
GEqualFuncFull equal_func,
diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h
index c336cf77f4..7a576ef9cc 100644
--- a/gio/gloadableicon.h
+++ b/gio/gloadableicon.h
@@ -75,22 +75,22 @@ struct _GLoadableIconIface
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_loadable_icon_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream *g_loadable_icon_load (GLoadableIcon *icon,
int size,
char **type,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_loadable_icon_load_async (GLoadableIcon *icon,
int size,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream *g_loadable_icon_load_finish (GLoadableIcon *icon,
GAsyncResult *res,
char **type,
diff --git a/gio/glocalfilemonitor.h b/gio/glocalfilemonitor.h
index 9ef770a916..9a776dd86e 100644
--- a/gio/glocalfilemonitor.h
+++ b/gio/glocalfilemonitor.h
@@ -66,7 +66,7 @@ struct _GLocalFileMonitorClass
};
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
#endif
GType g_local_file_monitor_get_type (void) G_GNUC_CONST;
@@ -93,7 +93,7 @@ g_local_file_monitor_new_in_worker (const gchar *pathname,
GError **error);
/* for implementations of GLocalFileMonitor */
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gboolean
g_file_monitor_source_handle_event (GFileMonitorSource *fms,
GFileMonitorEvent event_type,
diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h
index f8673dae62..fb72f2314e 100644
--- a/gio/gmemoryinputstream.h
+++ b/gio/gmemoryinputstream.h
@@ -67,23 +67,23 @@ struct _GMemoryInputStreamClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_memory_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream * g_memory_input_stream_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream * g_memory_input_stream_new_from_data (const void *data,
gssize len,
GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GInputStream * g_memory_input_stream_new_from_bytes (GBytes *bytes);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_memory_input_stream_add_data (GMemoryInputStream *stream,
const void *data,
gssize len,
GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_memory_input_stream_add_bytes (GMemoryInputStream *stream,
GBytes *bytes);
diff --git a/gio/gmemorymonitor.h b/gio/gmemorymonitor.h
index 9c547d819e..83c28b919c 100644
--- a/gio/gmemorymonitor.h
+++ b/gio/gmemorymonitor.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
#define G_MEMORY_MONITOR_EXTENSION_POINT_NAME "gio-memory-monitor"
#define G_TYPE_MEMORY_MONITOR (g_memory_monitor_get_type ())
-GLIB_AVAILABLE_IN_2_64
+GIO_AVAILABLE_IN_2_64
G_DECLARE_INTERFACE(GMemoryMonitor, g_memory_monitor, g, memory_monitor, GObject)
#define G_MEMORY_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_MEMORY_MONITOR,
GMemoryMonitor))
@@ -56,7 +56,7 @@ struct _GMemoryMonitorInterface {
GMemoryMonitorWarningLevel level);
};
-GLIB_AVAILABLE_IN_2_64
+GIO_AVAILABLE_IN_2_64
GMemoryMonitor *g_memory_monitor_dup_default (void);
G_END_DECLS
diff --git a/gio/gmemoryoutputstream.h b/gio/gmemoryoutputstream.h
index 5b13c3af64..08f5dcffb6 100644
--- a/gio/gmemoryoutputstream.h
+++ b/gio/gmemoryoutputstream.h
@@ -82,26 +82,26 @@ struct _GMemoryOutputStreamClass
typedef gpointer (* GReallocFunc) (gpointer data,
gsize size);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_memory_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream *g_memory_output_stream_new (gpointer data,
gsize size,
GReallocFunc realloc_function,
GDestroyNotify destroy_function);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GOutputStream *g_memory_output_stream_new_resizable (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gpointer g_memory_output_stream_get_data (GMemoryOutputStream *ostream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_memory_output_stream_get_size (GMemoryOutputStream *ostream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_memory_output_stream_get_data_size (GMemoryOutputStream *ostream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gpointer g_memory_output_stream_steal_data (GMemoryOutputStream *ostream);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GBytes * g_memory_output_stream_steal_as_bytes (GMemoryOutputStream *ostream);
G_END_DECLS
diff --git a/gio/gmenu.h b/gio/gmenu.h
index f1ff261952..68e0684293 100644
--- a/gio/gmenu.h
+++ b/gio/gmenu.h
@@ -41,141 +41,141 @@ G_BEGIN_DECLS
typedef struct _GMenuItem GMenuItem;
typedef struct _GMenu GMenu;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_menu_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenu * g_menu_new (void);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_freeze (GMenu *menu);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_insert_item (GMenu *menu,
gint position,
GMenuItem *item);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_prepend_item (GMenu *menu,
GMenuItem *item);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_append_item (GMenu *menu,
GMenuItem *item);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_remove (GMenu *menu,
gint position);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_menu_remove_all (GMenu *menu);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_insert (GMenu *menu,
gint position,
const gchar *label,
const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_prepend (GMenu *menu,
const gchar *label,
const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_append (GMenu *menu,
const gchar *label,
const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_insert_section (GMenu *menu,
gint position,
const gchar *label,
GMenuModel *section);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_prepend_section (GMenu *menu,
const gchar *label,
GMenuModel *section);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_append_section (GMenu *menu,
const gchar *label,
GMenuModel *section);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_insert_submenu (GMenu *menu,
gint position,
const gchar *label,
GMenuModel *submenu);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_prepend_submenu (GMenu *menu,
const gchar *label,
GMenuModel *submenu);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_append_submenu (GMenu *menu,
const gchar *label,
GMenuModel *submenu);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_menu_item_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenuItem * g_menu_item_new (const gchar *label,
const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GMenuItem * g_menu_item_new_from_model (GMenuModel *model,
gint item_index);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenuItem * g_menu_item_new_submenu (const gchar *label,
GMenuModel *submenu);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenuItem * g_menu_item_new_section (const gchar *label,
GMenuModel *section);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GVariant * g_menu_item_get_attribute_value (GMenuItem *menu_item,
const gchar *attribute,
const GVariantType *expected_type);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gboolean g_menu_item_get_attribute (GMenuItem *menu_item,
const gchar *attribute,
const gchar *format_string,
...);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GMenuModel *g_menu_item_get_link (GMenuItem *menu_item,
const gchar *link);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_attribute_value (GMenuItem *menu_item,
const gchar *attribute,
GVariant *value);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_attribute (GMenuItem *menu_item,
const gchar *attribute,
const gchar *format_string,
...);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_link (GMenuItem *menu_item,
const gchar *link,
GMenuModel *model);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_label (GMenuItem *menu_item,
const gchar *label);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_submenu (GMenuItem *menu_item,
GMenuModel *submenu);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_section (GMenuItem *menu_item,
GMenuModel *section);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_action_and_target_value (GMenuItem *menu_item,
const gchar *action,
GVariant *target_value);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_action_and_target (GMenuItem *menu_item,
const gchar *action,
const gchar *format_string,
...);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_item_set_detailed_action (GMenuItem *menu_item,
const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
void g_menu_item_set_icon (GMenuItem *menu_item,
GIcon *icon);
diff --git a/gio/gmenuexporter.h b/gio/gmenuexporter.h
index f3991663de..d5085637e5 100644
--- a/gio/gmenuexporter.h
+++ b/gio/gmenuexporter.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint g_dbus_connection_export_menu_model (GDBusConnection *connection,
const gchar *object_path,
GMenuModel *menu,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_dbus_connection_unexport_menu_model (GDBusConnection *connection,
guint export_id);
diff --git a/gio/gmenumodel.h b/gio/gmenumodel.h
index 1fcc19f46b..0ef7c9dc33 100644
--- a/gio/gmenumodel.h
+++ b/gio/gmenumodel.h
@@ -182,37 +182,37 @@ struct _GMenuModelClass
const gchar *link);
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_menu_model_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_menu_model_is_mutable (GMenuModel *model);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gint g_menu_model_get_n_items (GMenuModel *model);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenuAttributeIter * g_menu_model_iterate_item_attributes (GMenuModel *model,
gint item_index);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GVariant * g_menu_model_get_item_attribute_value (GMenuModel *model,
gint item_index,
const gchar *attribute,
const GVariantType *expected_type);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_menu_model_get_item_attribute (GMenuModel *model,
gint item_index,
const gchar *attribute,
const gchar *format_string,
...);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenuLinkIter * g_menu_model_iterate_item_links (GMenuModel *model,
gint item_index);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenuModel * g_menu_model_get_item_link (GMenuModel *model,
gint item_index,
const gchar *link);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_menu_model_items_changed (GMenuModel *model,
gint position,
gint removed,
@@ -246,18 +246,18 @@ struct _GMenuAttributeIterClass
GVariant **value);
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_menu_attribute_iter_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_menu_attribute_iter_get_next (GMenuAttributeIter *iter,
const gchar **out_name,
GVariant **value);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_menu_attribute_iter_next (GMenuAttributeIter *iter);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
const gchar * g_menu_attribute_iter_get_name (GMenuAttributeIter *iter);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GVariant * g_menu_attribute_iter_get_value (GMenuAttributeIter *iter);
@@ -288,18 +288,18 @@ struct _GMenuLinkIterClass
GMenuModel **value);
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_menu_link_iter_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_menu_link_iter_get_next (GMenuLinkIter *iter,
const gchar **out_link,
GMenuModel **value);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_menu_link_iter_next (GMenuLinkIter *iter);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
const gchar * g_menu_link_iter_get_name (GMenuLinkIter *iter);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GMenuModel * g_menu_link_iter_get_value (GMenuLinkIter *iter);
G_END_DECLS
diff --git a/gio/gmount.h b/gio/gmount.h
index a112bc539f..c17f79b33c 100644
--- a/gio/gmount.h
+++ b/gio/gmount.h
@@ -163,114 +163,114 @@ struct _GMountIface
GIcon * (* get_symbolic_icon) (GMount *mount);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_mount_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_mount_get_root (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_mount_get_default_location (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_mount_get_name (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_mount_get_icon (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_mount_get_symbolic_icon (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_mount_get_uuid (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVolume * g_mount_get_volume (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDrive * g_mount_get_drive (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_mount_can_unmount (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_mount_can_eject (GMount *mount);
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation)
+GIO_DEPRECATED_FOR(g_mount_unmount_with_operation)
void g_mount_unmount (GMount *mount,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation_finish)
+GIO_DEPRECATED_FOR(g_mount_unmount_with_operation_finish)
gboolean g_mount_unmount_finish (GMount *mount,
GAsyncResult *result,
GError **error);
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation)
+GIO_DEPRECATED_FOR(g_mount_eject_with_operation)
void g_mount_eject (GMount *mount,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_DEPRECATED_FOR(g_mount_eject_with_operation_finish)
+GIO_DEPRECATED_FOR(g_mount_eject_with_operation_finish)
gboolean g_mount_eject_finish (GMount *mount,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_remount (GMount *mount,
GMountMountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_mount_remount_finish (GMount *mount,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_guess_content_type (GMount *mount,
gboolean force_rescan,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar ** g_mount_guess_content_type_finish (GMount *mount,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar ** g_mount_guess_content_type_sync (GMount *mount,
gboolean force_rescan,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_mount_is_shadowed (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_shadow (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_unshadow (GMount *mount);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_unmount_with_operation (GMount *mount,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_mount_unmount_with_operation_finish (GMount *mount,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_eject_with_operation (GMount *mount,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_mount_eject_with_operation_finish (GMount *mount,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_mount_get_sort_key (GMount *mount);
G_END_DECLS
diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h
index 1f2d009c8f..b763f0d6af 100644
--- a/gio/gmountoperation.h
+++ b/gio/gmountoperation.h
@@ -120,57 +120,57 @@ struct _GMountOperationClass
void (*_g_reserved9) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_mount_operation_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GMountOperation * g_mount_operation_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_mount_operation_get_username (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_operation_set_username (GMountOperation *op,
const char *username);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_mount_operation_get_password (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_operation_set_password (GMountOperation *op,
const char *password);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_mount_operation_get_anonymous (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_operation_set_anonymous (GMountOperation *op,
gboolean anonymous);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_mount_operation_get_domain (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_operation_set_domain (GMountOperation *op,
const char *domain);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GPasswordSave g_mount_operation_get_password_save (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_operation_set_password_save (GMountOperation *op,
GPasswordSave save);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_mount_operation_get_choice (GMountOperation *op);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_operation_set_choice (GMountOperation *op,
int choice);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_mount_operation_reply (GMountOperation *op,
GMountOperationResult result);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
gboolean g_mount_operation_get_is_tcrypt_hidden_volume (GMountOperation *op);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
void g_mount_operation_set_is_tcrypt_hidden_volume (GMountOperation *op,
gboolean hidden_volume);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
gboolean g_mount_operation_get_is_tcrypt_system_volume (GMountOperation *op);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
void g_mount_operation_set_is_tcrypt_system_volume (GMountOperation *op,
gboolean system_volume);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
guint g_mount_operation_get_pim (GMountOperation *op);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
void g_mount_operation_set_pim (GMountOperation *op,
guint pim);
diff --git a/gio/gnativesocketaddress.h b/gio/gnativesocketaddress.h
index 01c839185b..cd174ec861 100644
--- a/gio/gnativesocketaddress.h
+++ b/gio/gnativesocketaddress.h
@@ -55,10 +55,10 @@ struct _GNativeSocketAddressClass
GSocketAddressClass parent_class;
};
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GType g_native_socket_address_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GSocketAddress *g_native_socket_address_new (gpointer native,
gsize len);
diff --git a/gio/gnativevolumemonitor.h b/gio/gnativevolumemonitor.h
index ef1f8d707b..9cea184b60 100644
--- a/gio/gnativevolumemonitor.h
+++ b/gio/gnativevolumemonitor.h
@@ -55,7 +55,7 @@ struct _GNativeVolumeMonitorClass
GCancellable *cancellable);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/gio/gnetworkaddress.h b/gio/gnetworkaddress.h
index c867a316ca..0a12d852b3 100644
--- a/gio/gnetworkaddress.h
+++ b/gio/gnetworkaddress.h
@@ -53,27 +53,27 @@ struct _GNetworkAddressClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_network_address_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnectable *g_network_address_new (const gchar *hostname,
guint16 port);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GSocketConnectable *g_network_address_new_loopback (guint16 port);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnectable *g_network_address_parse (const gchar *host_and_port,
guint16 default_port,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnectable *g_network_address_parse_uri (const gchar *uri,
guint16 default_port,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_network_address_get_hostname (GNetworkAddress *addr);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_network_address_get_port (GNetworkAddress *addr);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_network_address_get_scheme (GNetworkAddress *addr);
diff --git a/gio/gnetworking.h.in b/gio/gnetworking.h.in
index a59180673a..3561239f8c 100644
--- a/gio/gnetworking.h.in
+++ b/gio/gnetworking.h.in
@@ -73,7 +73,7 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_networking_init (void);
G_END_DECLS
diff --git a/gio/gnetworkmonitor.h b/gio/gnetworkmonitor.h
index e4d561d01a..8e6e903866 100644
--- a/gio/gnetworkmonitor.h
+++ b/gio/gnetworkmonitor.h
@@ -66,32 +66,32 @@ struct _GNetworkMonitorInterface {
GError **error);
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_network_monitor_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GNetworkMonitor *g_network_monitor_get_default (void);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_network_monitor_get_network_available (GNetworkMonitor *monitor);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_network_monitor_get_network_metered (GNetworkMonitor *monitor);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GNetworkConnectivity g_network_monitor_get_connectivity (GNetworkMonitor *monitor);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_network_monitor_can_reach (GNetworkMonitor *monitor,
GSocketConnectable *connectable,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_network_monitor_can_reach_async (GNetworkMonitor *monitor,
GSocketConnectable *connectable,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_network_monitor_can_reach_finish (GNetworkMonitor *monitor,
GAsyncResult *result,
GError **error);
diff --git a/gio/gnetworkmonitorbase.h b/gio/gnetworkmonitorbase.h
index 00502548d6..782ff43d48 100644
--- a/gio/gnetworkmonitorbase.h
+++ b/gio/gnetworkmonitorbase.h
@@ -50,17 +50,17 @@ struct _GNetworkMonitorBaseClass {
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_network_monitor_base_get_type (void);
/*< protected >*/
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_network_monitor_base_add_network (GNetworkMonitorBase *monitor,
GInetAddressMask *network);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_network_monitor_base_remove_network (GNetworkMonitorBase *monitor,
GInetAddressMask *network);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_network_monitor_base_set_networks (GNetworkMonitorBase *monitor,
GInetAddressMask **networks,
gint length);
diff --git a/gio/gnetworkservice.h b/gio/gnetworkservice.h
index e782dbec49..ac00986d95 100644
--- a/gio/gnetworkservice.h
+++ b/gio/gnetworkservice.h
@@ -53,23 +53,23 @@ struct _GNetworkServiceClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_network_service_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnectable *g_network_service_new (const gchar *service,
const gchar *protocol,
const gchar *domain);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_network_service_get_service (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_network_service_get_protocol (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_network_service_get_domain (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_network_service_get_scheme (GNetworkService *srv);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_network_service_set_scheme (GNetworkService *srv, const gchar *scheme);
G_END_DECLS
diff --git a/gio/gnotification.h b/gio/gnotification.h
index c38383c3f7..cef00a737f 100644
--- a/gio/gnotification.h
+++ b/gio/gnotification.h
@@ -35,65 +35,65 @@ G_BEGIN_DECLS
#define G_NOTIFICATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_NOTIFICATION, GNotification))
#define G_IS_NOTIFICATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_NOTIFICATION))
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GType g_notification_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GNotification * g_notification_new (const gchar *title);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_set_title (GNotification *notification,
const gchar *title);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_set_body (GNotification *notification,
const gchar *body);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_set_icon (GNotification *notification,
GIcon *icon);
-GLIB_DEPRECATED_IN_2_42_FOR(g_notification_set_priority)
+GIO_DEPRECATED_IN_2_42_FOR(g_notification_set_priority)
void g_notification_set_urgent (GNotification *notification,
gboolean urgent);
-GLIB_AVAILABLE_IN_2_42
+GIO_AVAILABLE_IN_2_42
void g_notification_set_priority (GNotification *notification,
GNotificationPriority priority);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
void g_notification_set_category (GNotification *notification,
const gchar *category);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_add_button (GNotification *notification,
const gchar *label,
const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_add_button_with_target (GNotification *notification,
const gchar *label,
const gchar *action,
const gchar *target_format,
...);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_add_button_with_target_value (GNotification *notification,
const gchar *label,
const gchar *action,
GVariant *target);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_set_default_action (GNotification *notification,
const gchar *detailed_action);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_set_default_action_and_target (GNotification *notification,
const gchar *action,
const gchar *target_format,
...);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_notification_set_default_action_and_target_value (GNotification *notification,
const gchar *action,
GVariant *target);
diff --git a/gio/gosxappinfo.h b/gio/gosxappinfo.h
index 1023b520d9..b029853fd0 100644
--- a/gio/gosxappinfo.h
+++ b/gio/gosxappinfo.h
@@ -41,13 +41,13 @@ struct _GOsxAppInfoClass
GObjectClass parent_class;
};
-GLIB_AVAILABLE_IN_2_52
+GIO_AVAILABLE_IN_2_52
GType g_osx_app_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_52
+GIO_AVAILABLE_IN_2_52
const char *g_osx_app_info_get_filename (GOsxAppInfo *info);
-GLIB_AVAILABLE_IN_2_52
+GIO_AVAILABLE_IN_2_52
GList * g_osx_app_info_get_all_for_scheme (const gchar *scheme);
G_END_DECLS
diff --git a/gio/goutputstream.h b/gio/goutputstream.h
index e32499d528..b5fafe9ef9 100644
--- a/gio/goutputstream.h
+++ b/gio/goutputstream.h
@@ -150,16 +150,16 @@ struct _GOutputStreamClass
void (*_g_reserved8) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_output_stream_write (GOutputStream *stream,
const void *buffer,
gsize count,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_write_all (GOutputStream *stream,
const void *buffer,
gsize count,
@@ -167,14 +167,14 @@ gboolean g_output_stream_write_all (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
gboolean g_output_stream_writev (GOutputStream *stream,
const GOutputVector *vectors,
gsize n_vectors,
gsize *bytes_written,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
gboolean g_output_stream_writev_all (GOutputStream *stream,
GOutputVector *vectors,
gsize n_vectors,
@@ -182,40 +182,40 @@ gboolean g_output_stream_writev_all (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_output_stream_printf (GOutputStream *stream,
gsize *bytes_written,
GCancellable *cancellable,
GError **error,
const gchar *format,
...) G_GNUC_PRINTF (5, 6);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_output_stream_vprintf (GOutputStream *stream,
gsize *bytes_written,
GCancellable *cancellable,
GError **error,
const gchar *format,
va_list args) G_GNUC_PRINTF (5, 0);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gssize g_output_stream_write_bytes (GOutputStream *stream,
GBytes *bytes,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_output_stream_splice (GOutputStream *stream,
GInputStream *source,
GOutputStreamSpliceFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_flush (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_close (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_output_stream_write_async (GOutputStream *stream,
const void *buffer,
gsize count,
@@ -223,12 +223,12 @@ void g_output_stream_write_async (GOutputStream *stream,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_output_stream_write_finish (GOutputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_output_stream_write_all_async (GOutputStream *stream,
const void *buffer,
gsize count,
@@ -237,13 +237,13 @@ void g_output_stream_write_all_async (GOutputStream *stream,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gboolean g_output_stream_write_all_finish (GOutputStream *stream,
GAsyncResult *result,
gsize *bytes_written,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_output_stream_writev_async (GOutputStream *stream,
const GOutputVector *vectors,
gsize n_vectors,
@@ -251,13 +251,13 @@ void g_output_stream_writev_async (GOutputStream *stream,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
gboolean g_output_stream_writev_finish (GOutputStream *stream,
GAsyncResult *result,
gsize *bytes_written,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_output_stream_writev_all_async (GOutputStream *stream,
GOutputVector *vectors,
gsize n_vectors,
@@ -266,24 +266,24 @@ void g_output_stream_writev_all_async (GOutputStream *stream,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
gboolean g_output_stream_writev_all_finish (GOutputStream *stream,
GAsyncResult *result,
gsize *bytes_written,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_output_stream_write_bytes_async (GOutputStream *stream,
GBytes *bytes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gssize g_output_stream_write_bytes_finish (GOutputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_output_stream_splice_async (GOutputStream *stream,
GInputStream *source,
GOutputStreamSpliceFlags flags,
@@ -291,41 +291,41 @@ void g_output_stream_splice_async (GOutputStream *stream,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_output_stream_splice_finish (GOutputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_output_stream_flush_async (GOutputStream *stream,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_flush_finish (GOutputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_output_stream_close_async (GOutputStream *stream,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_close_finish (GOutputStream *stream,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_is_closed (GOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_is_closing (GOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_has_pending (GOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_output_stream_set_pending (GOutputStream *stream,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_output_stream_clear_pending (GOutputStream *stream);
diff --git a/gio/gpermission.h b/gio/gpermission.h
index 1b67cf2c26..828f64231b 100644
--- a/gio/gpermission.h
+++ b/gio/gpermission.h
@@ -81,44 +81,44 @@ struct _GPermissionClass {
gpointer reserved[16];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_permission_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_permission_acquire (GPermission *permission,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_permission_acquire_async (GPermission *permission,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_permission_acquire_finish (GPermission *permission,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_permission_release (GPermission *permission,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_permission_release_async (GPermission *permission,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_permission_release_finish (GPermission *permission,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_permission_get_allowed (GPermission *permission);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_permission_get_can_acquire (GPermission *permission);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_permission_get_can_release (GPermission *permission);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_permission_impl_update (GPermission *permission,
gboolean allowed,
gboolean can_acquire,
diff --git a/gio/gpollableinputstream.h b/gio/gpollableinputstream.h
index 8ce59ebe59..7b659477c2 100644
--- a/gio/gpollableinputstream.h
+++ b/gio/gpollableinputstream.h
@@ -81,19 +81,19 @@ struct _GPollableInputStreamInterface
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_pollable_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_pollable_input_stream_can_poll (GPollableInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_pollable_input_stream_is_readable (GPollableInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSource *g_pollable_input_stream_create_source (GPollableInputStream *stream,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_pollable_input_stream_read_nonblocking (GPollableInputStream *stream,
void *buffer,
gsize count,
diff --git a/gio/gpollableoutputstream.h b/gio/gpollableoutputstream.h
index a35c2de731..a98bfa2a89 100644
--- a/gio/gpollableoutputstream.h
+++ b/gio/gpollableoutputstream.h
@@ -94,26 +94,26 @@ struct _GPollableOutputStreamInterface
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_pollable_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_pollable_output_stream_can_poll (GPollableOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_pollable_output_stream_is_writable (GPollableOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSource *g_pollable_output_stream_create_source (GPollableOutputStream *stream,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_pollable_output_stream_write_nonblocking (GPollableOutputStream *stream,
const void *buffer,
gsize count,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
GPollableReturn g_pollable_output_stream_writev_nonblocking (GPollableOutputStream *stream,
const GOutputVector *vectors,
gsize n_vectors,
diff --git a/gio/gpollableutils.h b/gio/gpollableutils.h
index 2527fd12c1..879bcbbc23 100644
--- a/gio/gpollableutils.h
+++ b/gio/gpollableutils.h
@@ -29,15 +29,15 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSource *g_pollable_source_new (GObject *pollable_stream);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GSource *g_pollable_source_new_full (gpointer pollable_stream,
GSource *child_source,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gssize g_pollable_stream_read (GInputStream *stream,
void *buffer,
gsize count,
@@ -45,14 +45,14 @@ gssize g_pollable_stream_read (GInputStream *stream,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gssize g_pollable_stream_write (GOutputStream *stream,
const void *buffer,
gsize count,
gboolean blocking,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gboolean g_pollable_stream_write_all (GOutputStream *stream,
const void *buffer,
gsize count,
diff --git a/gio/gpowerprofilemonitor.h b/gio/gpowerprofilemonitor.h
index 7ac3c570f8..e2c6aa75f5 100644
--- a/gio/gpowerprofilemonitor.h
+++ b/gio/gpowerprofilemonitor.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
#define G_POWER_PROFILE_MONITOR_EXTENSION_POINT_NAME "gio-power-profile-monitor"
#define G_TYPE_POWER_PROFILE_MONITOR (g_power_profile_monitor_get_type ())
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
G_DECLARE_INTERFACE (GPowerProfileMonitor, g_power_profile_monitor, g, power_profile_monitor, GObject)
#define G_POWER_PROFILE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
G_TYPE_POWER_PROFILE_MONITOR, GPowerProfileMonitor))
@@ -54,10 +54,10 @@ struct _GPowerProfileMonitorInterface
GTypeInterface g_iface;
};
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GPowerProfileMonitor *g_power_profile_monitor_dup_default (void);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
gboolean g_power_profile_monitor_get_power_saver_enabled (GPowerProfileMonitor *monitor);
G_END_DECLS
diff --git a/gio/gpropertyaction.h b/gio/gpropertyaction.h
index 67aa0b0e70..f746e741fc 100644
--- a/gio/gpropertyaction.h
+++ b/gio/gpropertyaction.h
@@ -36,10 +36,10 @@ G_BEGIN_DECLS
#define G_IS_PROPERTY_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst),
\
G_TYPE_PROPERTY_ACTION))
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
GType g_property_action_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_38
+GIO_AVAILABLE_IN_2_38
GPropertyAction * g_property_action_new (const gchar *name,
gpointer object,
const gchar *property_name);
diff --git a/gio/gproxy.h b/gio/gproxy.h
index e31f251824..de82410f9d 100644
--- a/gio/gproxy.h
+++ b/gio/gproxy.h
@@ -96,20 +96,20 @@ struct _GProxyInterface
gboolean (* supports_hostname) (GProxy *proxy);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_proxy_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GProxy *g_proxy_get_default_for_protocol (const gchar *protocol);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream *g_proxy_connect (GProxy *proxy,
GIOStream *connection,
GProxyAddress *proxy_address,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_proxy_connect_async (GProxy *proxy,
GIOStream *connection,
GProxyAddress *proxy_address,
@@ -117,12 +117,12 @@ void g_proxy_connect_async (GProxy *proxy,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream *g_proxy_connect_finish (GProxy *proxy,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_proxy_supports_hostname (GProxy *proxy);
G_END_DECLS
diff --git a/gio/gproxyaddress.h b/gio/gproxyaddress.h
index 0a432557e3..a0176d657c 100644
--- a/gio/gproxyaddress.h
+++ b/gio/gproxyaddress.h
@@ -55,10 +55,10 @@ struct _GProxyAddressClass
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_proxy_address_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_proxy_address_new (GInetAddress *inetaddr,
guint16 port,
const gchar *protocol,
@@ -67,20 +67,20 @@ GSocketAddress *g_proxy_address_new (GInetAddress *inetaddr,
const gchar *username,
const gchar *password);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_protocol (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
const gchar *g_proxy_address_get_destination_protocol (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_destination_hostname (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_proxy_address_get_destination_port (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_username (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_password (GProxyAddress *proxy);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
const gchar *g_proxy_address_get_uri (GProxyAddress *proxy);
G_END_DECLS
diff --git a/gio/gproxyaddressenumerator.h b/gio/gproxyaddressenumerator.h
index 3bb6d43532..b8d36a685e 100644
--- a/gio/gproxyaddressenumerator.h
+++ b/gio/gproxyaddressenumerator.h
@@ -75,7 +75,7 @@ struct _GProxyAddressEnumeratorClass
void (*_g_reserved7) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_proxy_address_enumerator_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/gio/gproxyresolver.h b/gio/gproxyresolver.h
index ee7852b23b..d564c990bb 100644
--- a/gio/gproxyresolver.h
+++ b/gio/gproxyresolver.h
@@ -68,25 +68,25 @@ struct _GProxyResolverInterface {
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_proxy_resolver_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GProxyResolver *g_proxy_resolver_get_default (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_proxy_resolver_is_supported (GProxyResolver *resolver);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar **g_proxy_resolver_lookup (GProxyResolver *resolver,
const gchar *uri,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_proxy_resolver_lookup_async (GProxyResolver *resolver,
const gchar *uri,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar **g_proxy_resolver_lookup_finish (GProxyResolver *resolver,
GAsyncResult *result,
GError **error);
diff --git a/gio/gremoteactiongroup.h b/gio/gremoteactiongroup.h
index aa72c3eafa..fb0847efcf 100644
--- a/gio/gremoteactiongroup.h
+++ b/gio/gremoteactiongroup.h
@@ -57,16 +57,16 @@ struct _GRemoteActionGroupInterface
GVariant *platform_data);
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_remote_action_group_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_remote_action_group_activate_action_full (GRemoteActionGroup *remote,
const gchar *action_name,
GVariant *parameter,
GVariant *platform_data);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_remote_action_group_change_action_state_full (GRemoteActionGroup *remote,
const gchar *action_name,
GVariant *value,
diff --git a/gio/gresolver.h b/gio/gresolver.h
index e5f46615a5..2dffeadbf9 100644
--- a/gio/gresolver.h
+++ b/gio/gresolver.h
@@ -183,69 +183,69 @@ struct _GResolverClass {
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_resolver_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GResolver *g_resolver_get_default (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_resolver_set_default (GResolver *resolver);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_resolver_lookup_by_name (GResolver *resolver,
const gchar *hostname,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_resolver_lookup_by_name_async (GResolver *resolver,
const gchar *hostname,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_resolver_lookup_by_name_finish (GResolver *resolver,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_resolver_lookup_by_name_with_flags_async (GResolver *resolver,
const gchar *hostname,
GResolverNameLookupFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
GList *g_resolver_lookup_by_name_with_flags_finish (GResolver *resolver,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
GList *g_resolver_lookup_by_name_with_flags (GResolver *resolver,
const gchar *hostname,
GResolverNameLookupFlags flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_resolver_free_addresses (GList *addresses);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_resolver_lookup_by_address (GResolver *resolver,
GInetAddress *address,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_resolver_lookup_by_address_async (GResolver *resolver,
GInetAddress *address,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar *g_resolver_lookup_by_address_finish (GResolver *resolver,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_resolver_lookup_service (GResolver *resolver,
const gchar *service,
const gchar *protocol,
const gchar *domain,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_resolver_lookup_service_async (GResolver *resolver,
const gchar *service,
const gchar *protocol,
@@ -253,28 +253,28 @@ void g_resolver_lookup_service_async (GResolver
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_resolver_lookup_service_finish (GResolver *resolver,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GList *g_resolver_lookup_records (GResolver *resolver,
const gchar *rrname,
GResolverRecordType record_type,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_resolver_lookup_records_async (GResolver *resolver,
const gchar *rrname,
GResolverRecordType record_type,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GList *g_resolver_lookup_records_finish (GResolver *resolver,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_resolver_free_targets (GList *targets);
@@ -286,7 +286,7 @@ void g_resolver_free_targets (GList
* error domains.
*/
#define G_RESOLVER_ERROR (g_resolver_error_quark ())
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GQuark g_resolver_error_quark (void);
G_END_DECLS
diff --git a/gio/gresource.h b/gio/gresource.h
index fe1610aac0..f9853aa286 100644
--- a/gio/gresource.h
+++ b/gio/gresource.h
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
* error domains.
*/
#define G_RESOURCE_ERROR (g_resource_error_quark ())
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GQuark g_resource_error_quark (void);
typedef struct _GStaticResource GStaticResource;
@@ -61,34 +61,34 @@ struct _GStaticResource {
gpointer padding;
};
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_resource_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GResource * g_resource_new_from_data (GBytes *data,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GResource * g_resource_ref (GResource *resource);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_resource_unref (GResource *resource);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GResource * g_resource_load (const gchar *filename,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GInputStream *g_resource_open_stream (GResource *resource,
const char *path,
GResourceLookupFlags lookup_flags,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GBytes * g_resource_lookup_data (GResource *resource,
const char *path,
GResourceLookupFlags lookup_flags,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
char ** g_resource_enumerate_children (GResource *resource,
const char *path,
GResourceLookupFlags lookup_flags,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_resource_get_info (GResource *resource,
const char *path,
GResourceLookupFlags lookup_flags,
@@ -96,23 +96,23 @@ gboolean g_resource_get_info (GResource *resource,
guint32 *flags,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_resources_register (GResource *resource);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_resources_unregister (GResource *resource);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GInputStream *g_resources_open_stream (const char *path,
GResourceLookupFlags lookup_flags,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GBytes * g_resources_lookup_data (const char *path,
GResourceLookupFlags lookup_flags,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
char ** g_resources_enumerate_children (const char *path,
GResourceLookupFlags lookup_flags,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_resources_get_info (const char *path,
GResourceLookupFlags lookup_flags,
gsize *size,
@@ -120,11 +120,11 @@ gboolean g_resources_get_info (const char *path,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_static_resource_init (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_static_resource_fini (GStaticResource *static_resource);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GResource *g_static_resource_get_resource (GStaticResource *static_resource);
G_END_DECLS
diff --git a/gio/gseekable.h b/gio/gseekable.h
index efc2d49a60..34510de6fb 100644
--- a/gio/gseekable.h
+++ b/gio/gseekable.h
@@ -78,22 +78,22 @@ struct _GSeekableIface
/* TODO: Async seek/truncate */
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_seekable_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
goffset g_seekable_tell (GSeekable *seekable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_seekable_can_seek (GSeekable *seekable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_seekable_seek (GSeekable *seekable,
goffset offset,
GSeekType type,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_seekable_can_truncate (GSeekable *seekable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_seekable_truncate (GSeekable *seekable,
goffset offset,
GCancellable *cancellable,
diff --git a/gio/gsettings.h b/gio/gsettings.h
index e23861873e..8a9d2b5c72 100644
--- a/gio/gsettings.h
+++ b/gio/gsettings.h
@@ -69,157 +69,157 @@ struct _GSettings
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_settings_get_type (void);
-GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas)
+GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas)
const gchar * const * g_settings_list_schemas (void);
-GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas)
+GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_source_list_schemas)
const gchar * const * g_settings_list_relocatable_schemas (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettings * g_settings_new (const gchar *schema_id);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettings * g_settings_new_with_path (const gchar *schema_id,
const gchar *path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettings * g_settings_new_with_backend (const gchar *schema_id,
GSettingsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettings * g_settings_new_with_backend_and_path (const gchar *schema_id,
GSettingsBackend *backend,
const gchar *path);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GSettings * g_settings_new_full (GSettingsSchema *schema,
GSettingsBackend *backend,
const gchar *path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar ** g_settings_list_children (GSettings *settings);
-GLIB_DEPRECATED_IN_2_46_FOR(g_settings_schema_list_keys)
+GIO_DEPRECATED_IN_2_46_FOR(g_settings_schema_list_keys)
gchar ** g_settings_list_keys (GSettings *settings);
-GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_get_range)
+GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_get_range)
GVariant * g_settings_get_range (GSettings *settings,
const gchar *key);
-GLIB_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_range_check)
+GIO_DEPRECATED_IN_2_40_FOR(g_settings_schema_key_range_check)
gboolean g_settings_range_check (GSettings *settings,
const gchar *key,
GVariant *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_value (GSettings *settings,
const gchar *key,
GVariant *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVariant * g_settings_get_value (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GVariant * g_settings_get_user_value (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GVariant * g_settings_get_default_value (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set (GSettings *settings,
const gchar *key,
const gchar *format,
...);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_get (GSettings *settings,
const gchar *key,
const gchar *format,
...);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_reset (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_settings_get_int (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_int (GSettings *settings,
const gchar *key,
gint value);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
gint64 g_settings_get_int64 (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
gboolean g_settings_set_int64 (GSettings *settings,
const gchar *key,
gint64 value);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint g_settings_get_uint (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_settings_set_uint (GSettings *settings,
const gchar *key,
guint value);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
guint64 g_settings_get_uint64 (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
gboolean g_settings_set_uint64 (GSettings *settings,
const gchar *key,
guint64 value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar * g_settings_get_string (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_string (GSettings *settings,
const gchar *key,
const gchar *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_get_boolean (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_boolean (GSettings *settings,
const gchar *key,
gboolean value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gdouble g_settings_get_double (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_double (GSettings *settings,
const gchar *key,
gdouble value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar ** g_settings_get_strv (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_strv (GSettings *settings,
const gchar *key,
const gchar *const *value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_settings_get_enum (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_enum (GSettings *settings,
const gchar *key,
gint value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_settings_get_flags (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_set_flags (GSettings *settings,
const gchar *key,
guint value);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettings * g_settings_get_child (GSettings *settings,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_is_writable (GSettings *settings,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_delay (GSettings *settings);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_apply (GSettings *settings);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_revert (GSettings *settings);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_settings_get_has_unapplied (GSettings *settings);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_sync (void);
/**
@@ -306,13 +306,13 @@ typedef enum
G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4)
} GSettingsBindFlags;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_bind (GSettings *settings,
const gchar *key,
gpointer object,
const gchar *property,
GSettingsBindFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_bind_with_mapping (GSettings *settings,
const gchar *key,
gpointer object,
@@ -322,21 +322,21 @@ void g_settings_bind_with_mapping (GSettin
GSettingsBindSetMapping
set_mapping,
gpointer user_data,
GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_bind_writable (GSettings *settings,
const gchar *key,
gpointer object,
const gchar *property,
gboolean inverted);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_unbind (gpointer object,
const gchar *property);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GAction * g_settings_create_action (GSettings *settings,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gpointer g_settings_get_mapped (GSettings *settings,
const gchar *key,
GSettingsGetMapping mapping,
diff --git a/gio/gsettingsbackend.h b/gio/gsettingsbackend.h
index d73211c99f..f579bf66f2 100644
--- a/gio/gsettingsbackend.h
+++ b/gio/gsettingsbackend.h
@@ -124,51 +124,51 @@ struct _GSettingsBackend
GSettingsBackendPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_settings_backend_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_backend_changed (GSettingsBackend *backend,
const gchar *key,
gpointer origin_tag);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_backend_path_changed (GSettingsBackend *backend,
const gchar *path,
gpointer origin_tag);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_backend_flatten_tree (GTree *tree,
gchar **path,
const gchar ***keys,
GVariant ***values);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_backend_keys_changed (GSettingsBackend *backend,
const gchar *path,
gchar const * const *items,
gpointer origin_tag);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_backend_path_writable_changed (GSettingsBackend *backend,
const gchar *path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_backend_writable_changed (GSettingsBackend *backend,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_settings_backend_changed_tree (GSettingsBackend *backend,
GTree *tree,
gpointer origin_tag);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettingsBackend * g_settings_backend_get_default (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettingsBackend * g_keyfile_settings_backend_new (const gchar *filename,
const gchar *root_path,
const gchar *root_group);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettingsBackend * g_null_settings_backend_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSettingsBackend * g_memory_settings_backend_new (void);
G_END_DECLS
diff --git a/gio/gsettingsschema.h b/gio/gsettingsschema.h
index bcb7bb0588..a3bb7df805 100644
--- a/gio/gsettingsschema.h
+++ b/gio/gsettingsschema.h
@@ -31,83 +31,83 @@ typedef struct _GSettingsSchema GSettingsSchema;
typedef struct _GSettingsSchemaKey GSettingsSchemaKey;
#define G_TYPE_SETTINGS_SCHEMA_SOURCE (g_settings_schema_source_get_type
())
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_settings_schema_source_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GSettingsSchemaSource * g_settings_schema_source_get_default (void);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GSettingsSchemaSource * g_settings_schema_source_ref (GSettingsSchemaSource *source);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_settings_schema_source_unref (GSettingsSchemaSource *source);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GSettingsSchemaSource * g_settings_schema_source_new_from_directory (const gchar *directory,
GSettingsSchemaSource *parent,
gboolean trusted,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GSettingsSchema * g_settings_schema_source_lookup (GSettingsSchemaSource *source,
const gchar *schema_id,
gboolean recursive);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_settings_schema_source_list_schemas (GSettingsSchemaSource *source,
gboolean recursive,
gchar
***non_relocatable,
gchar
***relocatable);
#define G_TYPE_SETTINGS_SCHEMA (g_settings_schema_get_type ())
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GType g_settings_schema_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GSettingsSchema * g_settings_schema_ref (GSettingsSchema *schema);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_settings_schema_unref (GSettingsSchema *schema);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
const gchar * g_settings_schema_get_id (GSettingsSchema *schema);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
const gchar * g_settings_schema_get_path (GSettingsSchema *schema);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSettingsSchemaKey * g_settings_schema_get_key (GSettingsSchema *schema,
const gchar *name);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_settings_schema_has_key (GSettingsSchema *schema,
const gchar *name);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gchar** g_settings_schema_list_keys (GSettingsSchema *schema);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gchar ** g_settings_schema_list_children (GSettingsSchema *schema);
#define G_TYPE_SETTINGS_SCHEMA_KEY (g_settings_schema_key_get_type ())
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GType g_settings_schema_key_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSettingsSchemaKey * g_settings_schema_key_ref (GSettingsSchemaKey *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_settings_schema_key_unref (GSettingsSchemaKey *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
const GVariantType * g_settings_schema_key_get_value_type (GSettingsSchemaKey *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GVariant * g_settings_schema_key_get_default_value (GSettingsSchemaKey *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GVariant * g_settings_schema_key_get_range (GSettingsSchemaKey *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_settings_schema_key_range_check (GSettingsSchemaKey *key,
GVariant *value);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
const gchar * g_settings_schema_key_get_name (GSettingsSchemaKey *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
const gchar * g_settings_schema_key_get_summary (GSettingsSchemaKey *key);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
const gchar * g_settings_schema_key_get_description (GSettingsSchemaKey *key);
G_END_DECLS
diff --git a/gio/gsimpleaction.h b/gio/gsimpleaction.h
index ff6111e0dc..ce80e7ae23 100644
--- a/gio/gsimpleaction.h
+++ b/gio/gsimpleaction.h
@@ -36,27 +36,27 @@ G_BEGIN_DECLS
#define G_IS_SIMPLE_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst),
\
G_TYPE_SIMPLE_ACTION))
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_simple_action_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSimpleAction * g_simple_action_new (const gchar *name,
const GVariantType *parameter_type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSimpleAction * g_simple_action_new_stateful (const gchar *name,
const GVariantType *parameter_type,
GVariant *state);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_simple_action_set_enabled (GSimpleAction *simple,
gboolean enabled);
-GLIB_AVAILABLE_IN_2_30
+GIO_AVAILABLE_IN_2_30
void g_simple_action_set_state (GSimpleAction *simple,
GVariant *value);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
void g_simple_action_set_state_hint (GSimpleAction *simple,
GVariant *state_hint);
diff --git a/gio/gsimpleactiongroup.h b/gio/gsimpleactiongroup.h
index 770e61efc7..99282baffd 100644
--- a/gio/gsimpleactiongroup.h
+++ b/gio/gsimpleactiongroup.h
@@ -70,25 +70,25 @@ struct _GSimpleActionGroupClass
gpointer padding[12];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_simple_action_group_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSimpleActionGroup * g_simple_action_group_new (void);
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_lookup_action)
+GIO_DEPRECATED_IN_2_38_FOR (g_action_map_lookup_action)
GAction * g_simple_action_group_lookup (GSimpleActionGroup *simple,
const gchar *action_name);
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action)
+GIO_DEPRECATED_IN_2_38_FOR (g_action_map_add_action)
void g_simple_action_group_insert (GSimpleActionGroup *simple,
GAction *action);
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_remove_action)
+GIO_DEPRECATED_IN_2_38_FOR (g_action_map_remove_action)
void g_simple_action_group_remove (GSimpleActionGroup *simple,
const gchar *action_name);
-GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action_entries)
+GIO_DEPRECATED_IN_2_38_FOR (g_action_map_add_action_entries)
void g_simple_action_group_add_entries (GSimpleActionGroup *simple,
const GActionEntry *entries,
gint n_entries,
diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h
index a9de5646fc..12efb9ce7d 100644
--- a/gio/gsimpleasyncresult.h
+++ b/gio/gsimpleasyncresult.h
@@ -46,15 +46,15 @@ G_BEGIN_DECLS
typedef struct _GSimpleAsyncResultClass GSimpleAsyncResultClass;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_simple_async_result_get_type (void) G_GNUC_CONST;
-GLIB_DEPRECATED_IN_2_46_FOR(g_task_new)
+GIO_DEPRECATED_IN_2_46_FOR(g_task_new)
GSimpleAsyncResult *g_simple_async_result_new (GObject *source_object,
GAsyncReadyCallback callback,
gpointer user_data,
gpointer source_tag);
-GLIB_DEPRECATED_IN_2_46_FOR(g_task_new)
+GIO_DEPRECATED_IN_2_46_FOR(g_task_new)
GSimpleAsyncResult *g_simple_async_result_new_error (GObject *source_object,
GAsyncReadyCallback callback,
gpointer user_data,
@@ -62,83 +62,83 @@ GSimpleAsyncResult *g_simple_async_result_new_error (GObject
gint code,
const char *format,
...) G_GNUC_PRINTF (6, 7);
-GLIB_DEPRECATED_IN_2_46_FOR(g_task_new)
+GIO_DEPRECATED_IN_2_46_FOR(g_task_new)
GSimpleAsyncResult *g_simple_async_result_new_from_error (GObject *source_object,
GAsyncReadyCallback callback,
gpointer user_data,
const GError *error);
-GLIB_DEPRECATED_IN_2_46_FOR(g_task_new)
+GIO_DEPRECATED_IN_2_46_FOR(g_task_new)
GSimpleAsyncResult *g_simple_async_result_new_take_error (GObject *source_object,
GAsyncReadyCallback callback,
gpointer user_data,
GError *error);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult *simple,
gpointer op_res,
GDestroyNotify destroy_op_res);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
gpointer g_simple_async_result_get_op_res_gpointer (GSimpleAsyncResult *simple);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_set_op_res_gssize (GSimpleAsyncResult *simple,
gssize op_res);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
gssize g_simple_async_result_get_op_res_gssize (GSimpleAsyncResult *simple);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult *simple,
gboolean op_res);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
gboolean g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResult *simple);
-GLIB_AVAILABLE_IN_2_32 /* Also deprecated, but can't mark something both AVAILABLE and DEPRECATED */
+GIO_AVAILABLE_IN_2_32 /* Also deprecated, but can't mark something both AVAILABLE and DEPRECATED */
void g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple,
GCancellable *check_cancellable);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
gpointer g_simple_async_result_get_source_tag (GSimpleAsyncResult *simple);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_set_handle_cancellation (GSimpleAsyncResult *simple,
gboolean handle_cancellation);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_complete (GSimpleAsyncResult *simple);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_complete_in_idle (GSimpleAsyncResult *simple);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_run_in_thread (GSimpleAsyncResult *simple,
GSimpleAsyncThreadFunc func,
int io_priority,
GCancellable *cancellable);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_set_from_error (GSimpleAsyncResult *simple,
const GError *error);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_take_error (GSimpleAsyncResult *simple,
GError *error);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
gboolean g_simple_async_result_propagate_error (GSimpleAsyncResult *simple,
GError **dest);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_set_error (GSimpleAsyncResult *simple,
GQuark domain,
gint code,
const char *format,
...) G_GNUC_PRINTF (4, 5);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
void g_simple_async_result_set_error_va (GSimpleAsyncResult *simple,
GQuark domain,
gint code,
const char *format,
va_list args)
G_GNUC_PRINTF(4, 0);
-GLIB_DEPRECATED_IN_2_46
+GIO_DEPRECATED_IN_2_46
gboolean g_simple_async_result_is_valid (GAsyncResult *result,
GObject *source,
gpointer source_tag);
-GLIB_DEPRECATED_IN_2_46_FOR(g_task_report_error)
+GIO_DEPRECATED_IN_2_46_FOR(g_task_report_error)
void g_simple_async_report_error_in_idle (GObject *object,
GAsyncReadyCallback callback,
gpointer user_data,
@@ -146,12 +146,12 @@ void g_simple_async_report_error_in_idle (GObject *object,
gint code,
const char *format,
...) G_GNUC_PRINTF(6, 7);
-GLIB_DEPRECATED_IN_2_46_FOR(g_task_report_error)
+GIO_DEPRECATED_IN_2_46_FOR(g_task_report_error)
void g_simple_async_report_gerror_in_idle (GObject *object,
GAsyncReadyCallback callback,
gpointer user_data,
const GError *error);
-GLIB_DEPRECATED_IN_2_46_FOR(g_task_report_error)
+GIO_DEPRECATED_IN_2_46_FOR(g_task_report_error)
void g_simple_async_report_take_gerror_in_idle (GObject *object,
GAsyncReadyCallback callback,
gpointer user_data,
diff --git a/gio/gsimpleiostream.h b/gio/gsimpleiostream.h
index 0f3334e369..1d98ffe911 100644
--- a/gio/gsimpleiostream.h
+++ b/gio/gsimpleiostream.h
@@ -35,10 +35,10 @@ G_BEGIN_DECLS
#define G_SIMPLE_IO_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
G_TYPE_SIMPLE_IO_STREAM, GSimpleIOStream))
#define G_IS_SIMPLE_IO_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
G_TYPE_SIMPLE_IO_STREAM))
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GType g_simple_io_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GIOStream *g_simple_io_stream_new (GInputStream *input_stream,
GOutputStream *output_stream);
diff --git a/gio/gsimplepermission.h b/gio/gsimplepermission.h
index d6abf9ebcc..19c42d7081 100644
--- a/gio/gsimplepermission.h
+++ b/gio/gsimplepermission.h
@@ -37,9 +37,9 @@ G_BEGIN_DECLS
#define G_IS_SIMPLE_PERMISSION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
G_TYPE_SIMPLE_PERMISSION))
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_simple_permission_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GPermission * g_simple_permission_new (gboolean allowed);
G_END_DECLS
diff --git a/gio/gsimpleproxyresolver.h b/gio/gsimpleproxyresolver.h
index f9e7a13ac7..2e5f4b2a82 100644
--- a/gio/gsimpleproxyresolver.h
+++ b/gio/gsimpleproxyresolver.h
@@ -66,22 +66,22 @@ struct _GSimpleProxyResolverClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GType g_simple_proxy_resolver_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GProxyResolver *g_simple_proxy_resolver_new (const gchar *default_proxy,
gchar **ignore_hosts);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_simple_proxy_resolver_set_default_proxy (GSimpleProxyResolver *resolver,
const gchar *default_proxy);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_simple_proxy_resolver_set_ignore_hosts (GSimpleProxyResolver *resolver,
gchar **ignore_hosts);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_simple_proxy_resolver_set_uri_proxy (GSimpleProxyResolver *resolver,
const gchar *uri_scheme,
const gchar *proxy);
diff --git a/gio/gsocket.h b/gio/gsocket.h
index 95674d6eab..0f0624be53 100644
--- a/gio/gsocket.h
+++ b/gio/gsocket.h
@@ -73,164 +73,164 @@ struct _GSocket
GSocketPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocket * g_socket_new (GSocketFamily family,
GSocketType type,
GSocketProtocol protocol,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocket * g_socket_new_from_fd (gint fd,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_socket_get_fd (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketFamily g_socket_get_family (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketType g_socket_get_socket_type (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketProtocol g_socket_get_protocol (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress * g_socket_get_local_address (GSocket *socket,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress * g_socket_get_remote_address (GSocket *socket,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_set_blocking (GSocket *socket,
gboolean blocking);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_get_blocking (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_set_keepalive (GSocket *socket,
gboolean keepalive);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_get_keepalive (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_socket_get_listen_backlog (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_set_listen_backlog (GSocket *socket,
gint backlog);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_socket_get_timeout (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_set_timeout (GSocket *socket,
guint timeout);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint g_socket_get_ttl (GSocket *socket);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_socket_set_ttl (GSocket *socket,
guint ttl);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_get_broadcast (GSocket *socket);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_socket_set_broadcast (GSocket *socket,
gboolean broadcast);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_get_multicast_loopback (GSocket *socket);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_socket_set_multicast_loopback (GSocket *socket,
gboolean loopback);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
guint g_socket_get_multicast_ttl (GSocket *socket);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_socket_set_multicast_ttl (GSocket *socket,
guint ttl);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_is_connected (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_bind (GSocket *socket,
GSocketAddress *address,
gboolean allow_reuse,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_join_multicast_group (GSocket *socket,
GInetAddress *group,
gboolean source_specific,
const gchar *iface,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_leave_multicast_group (GSocket *socket,
GInetAddress *group,
gboolean source_specific,
const gchar *iface,
GError **error);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
gboolean g_socket_join_multicast_group_ssm (GSocket *socket,
GInetAddress *group,
GInetAddress *source_specific,
const gchar *iface,
GError **error);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
gboolean g_socket_leave_multicast_group_ssm (GSocket *socket,
GInetAddress *group,
GInetAddress *source_specific,
const gchar *iface,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_connect (GSocket *socket,
GSocketAddress *address,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_check_connect_result (GSocket *socket,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_get_available_bytes (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOCondition g_socket_condition_check (GSocket *socket,
GIOCondition condition);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_condition_wait (GSocket *socket,
GIOCondition condition,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_condition_timed_wait (GSocket *socket,
GIOCondition condition,
gint64 timeout_us,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocket * g_socket_accept (GSocket *socket,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_listen (GSocket *socket,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_receive (GSocket *socket,
gchar *buffer,
gsize size,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_receive_from (GSocket *socket,
GSocketAddress **address,
gchar *buffer,
gsize size,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_send (GSocket *socket,
const gchar *buffer,
gsize size,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_send_to (GSocket *socket,
GSocketAddress *address,
const gchar *buffer,
gsize size,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_receive_message (GSocket *socket,
GSocketAddress **address,
GInputVector *vectors,
@@ -240,7 +240,7 @@ gssize g_socket_receive_message (GSocket
gint *flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_send_message (GSocket *socket,
GSocketAddress *address,
GOutputVector *vectors,
@@ -251,14 +251,14 @@ gssize g_socket_send_message (GSocket
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gint g_socket_receive_messages (GSocket *socket,
GInputMessage *messages,
guint num_messages,
gint flags,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gint g_socket_send_messages (GSocket *socket,
GOutputMessage *messages,
guint num_messages,
@@ -266,41 +266,41 @@ gint g_socket_send_messages (GSocket
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_close (GSocket *socket,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_shutdown (GSocket *socket,
gboolean shutdown_read,
gboolean shutdown_write,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_is_closed (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSource * g_socket_create_source (GSocket *socket,
GIOCondition condition,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_speaks_ipv4 (GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCredentials *g_socket_get_credentials (GSocket *socket,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_receive_with_blocking (GSocket *socket,
gchar *buffer,
gsize size,
gboolean blocking,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_send_with_blocking (GSocket *socket,
const gchar *buffer,
gsize size,
gboolean blocking,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
GPollableReturn g_socket_send_message_with_timeout (GSocket *socket,
GSocketAddress *address,
const GOutputVector *vectors,
@@ -312,13 +312,13 @@ GPollableReturn g_socket_send_message_with_timeout (GSocket
gsize *bytes_written,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_socket_get_option (GSocket *socket,
gint level,
gint optname,
gint *value,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_socket_set_option (GSocket *socket,
gint level,
gint optname,
diff --git a/gio/gsocketaddress.h b/gio/gsocketaddress.h
index 5c2079b577..b2dcef2427 100644
--- a/gio/gsocketaddress.h
+++ b/gio/gsocketaddress.h
@@ -60,23 +60,23 @@ struct _GSocketAddressClass
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_address_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketFamily g_socket_address_get_family (GSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress * g_socket_address_new_from_native (gpointer native,
gsize len);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_address_to_native (GSocketAddress *address,
gpointer dest,
gsize destlen,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gssize g_socket_address_get_native_size (GSocketAddress *address);
G_END_DECLS
diff --git a/gio/gsocketaddressenumerator.h b/gio/gsocketaddressenumerator.h
index 4806724feb..ceee6a3f9a 100644
--- a/gio/gsocketaddressenumerator.h
+++ b/gio/gsocketaddressenumerator.h
@@ -79,20 +79,20 @@ struct _GSocketAddressEnumeratorClass
GError **error);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_address_enumerator_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_socket_address_enumerator_next (GSocketAddressEnumerator *enumerator,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_address_enumerator_next_async (GSocketAddressEnumerator *enumerator,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_socket_address_enumerator_next_finish (GSocketAddressEnumerator *enumerator,
GAsyncResult *result,
GError **error);
diff --git a/gio/gsocketclient.h b/gio/gsocketclient.h
index 42dc0ccdf5..e9f815eef3 100644
--- a/gio/gsocketclient.h
+++ b/gio/gsocketclient.h
@@ -70,127 +70,127 @@ struct _GSocketClient
GSocketClientPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_client_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketClient *g_socket_client_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketFamily g_socket_client_get_family (GSocketClient *client);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_set_family (GSocketClient *client,
GSocketFamily family);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketType g_socket_client_get_socket_type (GSocketClient *client);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_set_socket_type (GSocketClient *client,
GSocketType type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketProtocol g_socket_client_get_protocol (GSocketClient *client);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_set_protocol (GSocketClient *client,
GSocketProtocol protocol);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_socket_client_get_local_address (GSocketClient *client);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_set_local_address (GSocketClient *client,
GSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint g_socket_client_get_timeout (GSocketClient *client);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_set_timeout (GSocketClient *client,
guint timeout);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_client_get_enable_proxy (GSocketClient *client);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_set_enable_proxy (GSocketClient *client,
gboolean enable);
-GLIB_AVAILABLE_IN_2_28
+GIO_AVAILABLE_IN_2_28
gboolean g_socket_client_get_tls (GSocketClient *client);
-GLIB_AVAILABLE_IN_2_28
+GIO_AVAILABLE_IN_2_28
void g_socket_client_set_tls (GSocketClient *client,
gboolean tls);
-GLIB_DEPRECATED_IN_2_72
+GIO_DEPRECATED_IN_2_72
GTlsCertificateFlags g_socket_client_get_tls_validation_flags (GSocketClient *client);
-GLIB_DEPRECATED_IN_2_72
+GIO_DEPRECATED_IN_2_72
void g_socket_client_set_tls_validation_flags (GSocketClient *client,
GTlsCertificateFlags flags);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GProxyResolver *g_socket_client_get_proxy_resolver (GSocketClient *client);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_socket_client_set_proxy_resolver (GSocketClient *client,
GProxyResolver
*proxy_resolver);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_client_connect (GSocketClient *client,
GSocketConnectable *connectable,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_client_connect_to_host (GSocketClient *client,
const gchar *host_and_port,
guint16 default_port,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_client_connect_to_service (GSocketClient *client,
const gchar *domain,
const gchar *service,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_26
+GIO_AVAILABLE_IN_2_26
GSocketConnection * g_socket_client_connect_to_uri (GSocketClient *client,
const gchar *uri,
guint16 default_port,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_connect_async (GSocketClient *client,
GSocketConnectable *connectable,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_client_connect_finish (GSocketClient *client,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_connect_to_host_async (GSocketClient *client,
const gchar *host_and_port,
guint16 default_port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_client_connect_to_host_finish (GSocketClient *client,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_connect_to_service_async (GSocketClient *client,
const gchar *domain,
const gchar *service,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_client_connect_to_service_finish (GSocketClient *client,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_connect_to_uri_async (GSocketClient *client,
const gchar *uri,
guint16 default_port,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_client_connect_to_uri_finish (GSocketClient *client,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_client_add_application_proxy (GSocketClient *client,
const gchar *protocol);
diff --git a/gio/gsocketconnectable.h b/gio/gsocketconnectable.h
index 622b6d4860..ed2cad9fc6 100644
--- a/gio/gsocketconnectable.h
+++ b/gio/gsocketconnectable.h
@@ -65,16 +65,16 @@ struct _GSocketConnectableIface
gchar * (* to_string) (GSocketConnectable *connectable);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_connectable_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddressEnumerator *g_socket_connectable_enumerate (GSocketConnectable *connectable);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddressEnumerator *g_socket_connectable_proxy_enumerate (GSocketConnectable *connectable);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gchar *g_socket_connectable_to_string (GSocketConnectable *connectable);
G_END_DECLS
diff --git a/gio/gsocketconnection.h b/gio/gsocketconnection.h
index 508b67c808..45de5ba989 100644
--- a/gio/gsocketconnection.h
+++ b/gio/gsocketconnection.h
@@ -70,46 +70,46 @@ struct _GSocketConnection
GSocketConnectionPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_connection_is_connected (GSocketConnection *connection);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_connection_connect (GSocketConnection *connection,
GSocketAddress *address,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_socket_connection_connect_async (GSocketConnection *connection,
GSocketAddress *address,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_socket_connection_connect_finish (GSocketConnection *connection,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocket *g_socket_connection_get_socket (GSocketConnection *connection);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_socket_connection_get_local_address (GSocketConnection *connection,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_socket_connection_get_remote_address (GSocketConnection *connection,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_connection_factory_register_type (GType g_type,
GSocketFamily family,
GSocketType type,
gint protocol);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_connection_factory_lookup_type (GSocketFamily family,
GSocketType type,
gint protocol_id);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection *g_socket_connection_factory_create_connection (GSocket *socket);
G_END_DECLS
diff --git a/gio/gsocketcontrolmessage.h b/gio/gsocketcontrolmessage.h
index a80b1cf5d5..51be2e1730 100644
--- a/gio/gsocketcontrolmessage.h
+++ b/gio/gsocketcontrolmessage.h
@@ -90,18 +90,18 @@ struct _GSocketControlMessage
GSocketControlMessagePrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_control_message_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_socket_control_message_get_size (GSocketControlMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_socket_control_message_get_level (GSocketControlMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
int g_socket_control_message_get_msg_type (GSocketControlMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_control_message_serialize (GSocketControlMessage *message,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketControlMessage *g_socket_control_message_deserialize (int level,
int type,
gsize size,
diff --git a/gio/gsocketlistener.h b/gio/gsocketlistener.h
index 9c90d8d404..9ad6c8fe6f 100644
--- a/gio/gsocketlistener.h
+++ b/gio/gsocketlistener.h
@@ -81,22 +81,22 @@ struct _GSocketListener
GSocketListenerPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_listener_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketListener * g_socket_listener_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_listener_set_backlog (GSocketListener *listener,
int listen_backlog);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_listener_add_socket (GSocketListener *listener,
GSocket *socket,
GObject *source_object,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_listener_add_address (GSocketListener *listener,
GSocketAddress *address,
GSocketType type,
@@ -104,52 +104,52 @@ gboolean g_socket_listener_add_address (GSocket
GObject *source_object,
GSocketAddress
**effective_address,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_listener_add_inet_port (GSocketListener *listener,
guint16 port,
GObject *source_object,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_socket_listener_add_any_inet_port (GSocketListener *listener,
GObject *source_object,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocket * g_socket_listener_accept_socket (GSocketListener *listener,
GObject **source_object,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_listener_accept_socket_async (GSocketListener *listener,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocket * g_socket_listener_accept_socket_finish (GSocketListener *listener,
GAsyncResult *result,
GObject **source_object,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_listener_accept (GSocketListener *listener,
GObject **source_object,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_listener_accept_async (GSocketListener *listener,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection * g_socket_listener_accept_finish (GSocketListener *listener,
GAsyncResult *result,
GObject **source_object,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_listener_close (GSocketListener *listener);
G_END_DECLS
diff --git a/gio/gsocketservice.h b/gio/gsocketservice.h
index 8ff53259f1..f4e7c220ec 100644
--- a/gio/gsocketservice.h
+++ b/gio/gsocketservice.h
@@ -77,16 +77,16 @@ struct _GSocketService
GSocketServicePrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_socket_service_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketService *g_socket_service_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_service_start (GSocketService *service);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_socket_service_stop (GSocketService *service);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_socket_service_is_active (GSocketService *service);
diff --git a/gio/gsrvtarget.h b/gio/gsrvtarget.h
index 027a072808..92bb256bc1 100644
--- a/gio/gsrvtarget.h
+++ b/gio/gsrvtarget.h
@@ -29,30 +29,30 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_srv_target_get_type (void) G_GNUC_CONST;
#define G_TYPE_SRV_TARGET (g_srv_target_get_type ())
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSrvTarget *g_srv_target_new (const gchar *hostname,
guint16 port,
guint16 priority,
guint16 weight);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSrvTarget *g_srv_target_copy (GSrvTarget *target);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_srv_target_free (GSrvTarget *target);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar *g_srv_target_get_hostname (GSrvTarget *target);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_srv_target_get_port (GSrvTarget *target);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_srv_target_get_priority (GSrvTarget *target);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
guint16 g_srv_target_get_weight (GSrvTarget *target);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_srv_target_list_sort (GList *targets);
G_END_DECLS
diff --git a/gio/gsubprocess.h b/gio/gsubprocess.h
index 5b483c072a..4d5b488650 100644
--- a/gio/gsubprocess.h
+++ b/gio/gsubprocess.h
@@ -35,129 +35,129 @@ G_BEGIN_DECLS
#define G_SUBPROCESS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SUBPROCESS, GSubprocess))
#define G_IS_SUBPROCESS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SUBPROCESS))
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GType g_subprocess_get_type (void) G_GNUC_CONST;
/**** Core API ****/
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_new (GSubprocessFlags flags,
GError **error,
const gchar *argv0,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_newv (const gchar * const *argv,
GSubprocessFlags flags,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GOutputStream * g_subprocess_get_stdin_pipe (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GInputStream * g_subprocess_get_stdout_pipe (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GInputStream * g_subprocess_get_stderr_pipe (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
const gchar * g_subprocess_get_identifier (GSubprocess *subprocess);
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_send_signal (GSubprocess *subprocess,
gint signal_num);
#endif
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_force_exit (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_wait (GSubprocess *subprocess,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_wait_async (GSubprocess *subprocess,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_wait_finish (GSubprocess *subprocess,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_wait_check (GSubprocess *subprocess,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_wait_check_async (GSubprocess *subprocess,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_wait_check_finish (GSubprocess *subprocess,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gint g_subprocess_get_status (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_get_successful (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_get_if_exited (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gint g_subprocess_get_exit_status (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_get_if_signaled (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gint g_subprocess_get_term_sig (GSubprocess *subprocess);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate (GSubprocess *subprocess,
GBytes *stdin_buf,
GCancellable *cancellable,
GBytes **stdout_buf,
GBytes **stderr_buf,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_communicate_async (GSubprocess *subprocess,
GBytes *stdin_buf,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate_finish (GSubprocess *subprocess,
GAsyncResult *result,
GBytes **stdout_buf,
GBytes **stderr_buf,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate_utf8 (GSubprocess *subprocess,
const char *stdin_buf,
GCancellable *cancellable,
char **stdout_buf,
char **stderr_buf,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_communicate_utf8_async (GSubprocess *subprocess,
const char *stdin_buf,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate_utf8_finish (GSubprocess *subprocess,
GAsyncResult *result,
char **stdout_buf,
diff --git a/gio/gsubprocesslauncher.h b/gio/gsubprocesslauncher.h
index 5719d795c6..0ab91452a2 100644
--- a/gio/gsubprocesslauncher.h
+++ b/gio/gsubprocesslauncher.h
@@ -37,79 +37,79 @@ G_BEGIN_DECLS
#define G_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SUBPROCESS_LAUNCHER,
GSubprocessLauncher))
#define G_IS_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SUBPROCESS_LAUNCHER))
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GType g_subprocess_launcher_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSubprocessLauncher * g_subprocess_launcher_new (GSubprocessFlags flags);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_launcher_spawn (GSubprocessLauncher *self,
GError **error,
const gchar *argv0,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_launcher_spawnv (GSubprocessLauncher *self,
const gchar * const *argv,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_environ (GSubprocessLauncher *self,
gchar **env);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_setenv (GSubprocessLauncher *self,
const gchar *variable,
const gchar *value,
gboolean overwrite);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_unsetenv (GSubprocessLauncher *self,
const gchar *variable);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
const gchar * g_subprocess_launcher_getenv (GSubprocessLauncher *self,
const gchar *variable);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_cwd (GSubprocessLauncher *self,
const gchar *cwd);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_flags (GSubprocessLauncher *self,
GSubprocessFlags flags);
/* Extended I/O control, only available on UNIX */
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_stdin_file_path (GSubprocessLauncher *self,
const gchar *path);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_take_stdin_fd (GSubprocessLauncher *self,
gint fd);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_stdout_file_path (GSubprocessLauncher *self,
const gchar *path);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_take_stdout_fd (GSubprocessLauncher *self,
gint fd);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_stderr_file_path (GSubprocessLauncher *self,
const gchar *path);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_take_stderr_fd (GSubprocessLauncher *self,
gint fd);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_take_fd (GSubprocessLauncher *self,
gint source_fd,
gint target_fd);
-GLIB_AVAILABLE_IN_2_68
+GIO_AVAILABLE_IN_2_68
void g_subprocess_launcher_close (GSubprocessLauncher *self);
/* Child setup, only available on UNIX */
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_child_setup (GSubprocessLauncher *self,
GSpawnChildSetupFunc child_setup,
gpointer user_data,
diff --git a/gio/gtask.h b/gio/gtask.h
index 235e6626dd..0f17ad53f6 100644
--- a/gio/gtask.h
+++ b/gio/gtask.h
@@ -38,22 +38,22 @@ G_BEGIN_DECLS
typedef struct _GTaskClass GTaskClass;
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GType g_task_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GTask *g_task_new (gpointer source_object,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer callback_data);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_report_error (gpointer source_object,
GAsyncReadyCallback callback,
gpointer callback_data,
gpointer source_tag,
GError *error);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_report_new_error (gpointer source_object,
GAsyncReadyCallback callback,
gpointer callback_data,
@@ -63,20 +63,20 @@ void g_task_report_new_error (gpointer source_object,
const char *format,
...) G_GNUC_PRINTF(7, 8);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_set_task_data (GTask *task,
gpointer task_data,
GDestroyNotify task_data_destroy);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_set_priority (GTask *task,
gint priority);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_set_check_cancellable (GTask *task,
gboolean check_cancellable);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_set_source_tag (GTask *task,
gpointer source_tag);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_task_set_name (GTask *task,
const gchar *name);
@@ -90,24 +90,24 @@ void g_task_set_name (GTask *task,
} G_STMT_END
#endif
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gpointer g_task_get_source_object (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gpointer g_task_get_task_data (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gint g_task_get_priority (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GMainContext *g_task_get_context (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
GCancellable *g_task_get_cancellable (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_task_get_check_cancellable (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gpointer g_task_get_source_tag (GTask *task);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
const gchar *g_task_get_name (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_task_is_valid (gpointer result,
gpointer source_object);
@@ -116,67 +116,67 @@ typedef void (*GTaskThreadFunc) (GTask *task,
gpointer source_object,
gpointer task_data,
GCancellable *cancellable);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_run_in_thread (GTask *task,
GTaskThreadFunc task_func);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_run_in_thread_sync (GTask *task,
GTaskThreadFunc task_func);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_task_set_return_on_cancel (GTask *task,
gboolean return_on_cancel);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_task_get_return_on_cancel (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_attach_source (GTask *task,
GSource *source,
GSourceFunc callback);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_return_pointer (GTask *task,
gpointer result,
GDestroyNotify result_destroy);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_return_boolean (GTask *task,
gboolean result);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_return_int (GTask *task,
gssize result);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_return_error (GTask *task,
GError *error);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
void g_task_return_new_error (GTask *task,
GQuark domain,
gint code,
const char *format,
...) G_GNUC_PRINTF (4, 5);
-GLIB_AVAILABLE_IN_2_64
+GIO_AVAILABLE_IN_2_64
void g_task_return_value (GTask *task,
GValue *result);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_task_return_error_if_cancelled (GTask *task);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gpointer g_task_propagate_pointer (GTask *task,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_task_propagate_boolean (GTask *task,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gssize g_task_propagate_int (GTask *task,
GError **error);
-GLIB_AVAILABLE_IN_2_64
+GIO_AVAILABLE_IN_2_64
gboolean g_task_propagate_value (GTask *task,
GValue *value,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GIO_AVAILABLE_IN_2_36
gboolean g_task_had_error (GTask *task);
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
gboolean g_task_get_completed (GTask *task);
G_END_DECLS
diff --git a/gio/gtcpconnection.h b/gio/gtcpconnection.h
index 29f6bc0a13..03aa28ad30 100644
--- a/gio/gtcpconnection.h
+++ b/gio/gtcpconnection.h
@@ -57,13 +57,13 @@ struct _GTcpConnection
GTcpConnectionPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tcp_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tcp_connection_set_graceful_disconnect (GTcpConnection *connection,
gboolean graceful_disconnect);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_tcp_connection_get_graceful_disconnect (GTcpConnection *connection);
G_END_DECLS
diff --git a/gio/gtcpwrapperconnection.h b/gio/gtcpwrapperconnection.h
index dff4fe776b..1027154fb0 100644
--- a/gio/gtcpwrapperconnection.h
+++ b/gio/gtcpwrapperconnection.h
@@ -57,13 +57,13 @@ struct _GTcpWrapperConnection
GTcpWrapperConnectionPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tcp_wrapper_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnection *g_tcp_wrapper_connection_new (GIOStream *base_io_stream,
GSocket *socket);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream *g_tcp_wrapper_connection_get_base_io_stream (GTcpWrapperConnection *conn);
G_END_DECLS
diff --git a/gio/gtestdbus.h b/gio/gtestdbus.h
index ccaaa628f2..f52ea1eb11 100644
--- a/gio/gtestdbus.h
+++ b/gio/gtestdbus.h
@@ -41,32 +41,32 @@ G_BEGIN_DECLS
#define G_IS_TEST_DBUS(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_TEST_DBUS))
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GType g_test_dbus_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GTestDBus * g_test_dbus_new (GTestDBusFlags flags);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
GTestDBusFlags g_test_dbus_get_flags (GTestDBus *self);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
const gchar * g_test_dbus_get_bus_address (GTestDBus *self);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_test_dbus_add_service_dir (GTestDBus *self,
const gchar *path);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_test_dbus_up (GTestDBus *self);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_test_dbus_stop (GTestDBus *self);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_test_dbus_down (GTestDBus *self);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
void g_test_dbus_unset (void);
G_END_DECLS
diff --git a/gio/gthemedicon.h b/gio/gthemedicon.h
index f530639002..5ac36ce4fb 100644
--- a/gio/gthemedicon.h
+++ b/gio/gthemedicon.h
@@ -45,24 +45,24 @@ G_BEGIN_DECLS
**/
typedef struct _GThemedIconClass GThemedIconClass;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_themed_icon_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon *g_themed_icon_new (const char *iconname);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon *g_themed_icon_new_from_names (char **iconnames,
int len);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_themed_icon_prepend_name (GThemedIcon *icon,
const char *iconname);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_themed_icon_append_name (GThemedIcon *icon,
const char *iconname);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar* const * g_themed_icon_get_names (GThemedIcon *icon);
G_END_DECLS
diff --git a/gio/gthreadedresolver.h b/gio/gthreadedresolver.h
index c3ca08283c..ea76e4bfd5 100644
--- a/gio/gthreadedresolver.h
+++ b/gio/gthreadedresolver.h
@@ -41,19 +41,19 @@ typedef struct {
} GThreadedResolverClass;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_threaded_resolver_get_type (void) G_GNUC_CONST;
/* Used for a private test API */
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_resolver_records_from_res_query (const gchar *rrname,
gint rrtype,
const guint8 *answer,
gssize len,
gint herr,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_resolver_record_type_to_rrtype (GResolverRecordType type);
#endif
diff --git a/gio/gthreadedsocketservice.h b/gio/gthreadedsocketservice.h
index 40ce619aa8..48f5a31209 100644
--- a/gio/gthreadedsocketservice.h
+++ b/gio/gthreadedsocketservice.h
@@ -73,9 +73,9 @@ struct _GThreadedSocketService
GThreadedSocketServicePrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_threaded_socket_service_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketService * g_threaded_socket_service_new (int max_threads);
G_END_DECLS
diff --git a/gio/gtlsbackend.h b/gio/gtlsbackend.h
index 21c931f3d7..dc51b230a0 100644
--- a/gio/gtlsbackend.h
+++ b/gio/gtlsbackend.h
@@ -79,35 +79,35 @@ struct _GTlsBackendInterface
GType ( *get_dtls_server_connection_type) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_backend_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsBackend * g_tls_backend_get_default (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsDatabase * g_tls_backend_get_default_database (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_tls_backend_set_default_database (GTlsBackend *backend,
GTlsDatabase *database);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_tls_backend_supports_tls (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
gboolean g_tls_backend_supports_dtls (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_backend_get_certificate_type (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_backend_get_client_connection_type (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_backend_get_server_connection_type (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_backend_get_file_database_type (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GType g_tls_backend_get_dtls_client_connection_type (GTlsBackend *backend);
-GLIB_AVAILABLE_IN_2_48
+GIO_AVAILABLE_IN_2_48
GType g_tls_backend_get_dtls_server_connection_type (GTlsBackend *backend);
G_END_DECLS
diff --git a/gio/gtlscertificate.h b/gio/gtlscertificate.h
index 6fd6fdafff..c8d10bff8e 100644
--- a/gio/gtlscertificate.h
+++ b/gio/gtlscertificate.h
@@ -58,66 +58,66 @@ struct _GTlsCertificateClass
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_certificate_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate *g_tls_certificate_new_from_pem (const gchar *data,
gssize length,
GError **error);
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
GTlsCertificate *g_tls_certificate_new_from_pkcs12 (const guint8 *data,
gsize length,
const gchar *password,
GError **error);
-GLIB_AVAILABLE_IN_2_72
+GIO_AVAILABLE_IN_2_72
GTlsCertificate *g_tls_certificate_new_from_file_with_password (const gchar *file,
const gchar *password,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate *g_tls_certificate_new_from_file (const gchar *file,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate *g_tls_certificate_new_from_files (const gchar *cert_file,
const gchar *key_file,
GError **error);
-GLIB_AVAILABLE_IN_2_68
+GIO_AVAILABLE_IN_2_68
GTlsCertificate *g_tls_certificate_new_from_pkcs11_uris (const gchar *pkcs11_uri,
const gchar *private_key_pkcs11_uri,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList *g_tls_certificate_list_new_from_file (const gchar *file,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate *g_tls_certificate_get_issuer (GTlsCertificate *cert);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificateFlags g_tls_certificate_verify (GTlsCertificate *cert,
GSocketConnectable *identity,
GTlsCertificate *trusted_ca);
-GLIB_AVAILABLE_IN_2_34
+GIO_AVAILABLE_IN_2_34
gboolean g_tls_certificate_is_same (GTlsCertificate *cert_one,
GTlsCertificate *cert_two);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GDateTime *g_tls_certificate_get_not_valid_before (GTlsCertificate *cert);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GDateTime *g_tls_certificate_get_not_valid_after (GTlsCertificate *cert);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
gchar *g_tls_certificate_get_subject_name (GTlsCertificate *cert);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
gchar *g_tls_certificate_get_issuer_name (GTlsCertificate *cert);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GPtrArray *g_tls_certificate_get_dns_names (GTlsCertificate *cert);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GPtrArray *g_tls_certificate_get_ip_addresses (GTlsCertificate *cert);
G_END_DECLS
diff --git a/gio/gtlsclientconnection.h b/gio/gtlsclientconnection.h
index e75e0cc5da..32d6274df3 100644
--- a/gio/gtlsclientconnection.h
+++ b/gio/gtlsclientconnection.h
@@ -53,33 +53,33 @@ struct _GTlsClientConnectionInterface
GTlsClientConnection *source);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_client_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream * g_tls_client_connection_new (GIOStream *base_io_stream,
GSocketConnectable *server_identity,
GError **error);
-GLIB_DEPRECATED_IN_2_72
+GIO_DEPRECATED_IN_2_72
GTlsCertificateFlags g_tls_client_connection_get_validation_flags (GTlsClientConnection *conn);
-GLIB_DEPRECATED_IN_2_72
+GIO_DEPRECATED_IN_2_72
void g_tls_client_connection_set_validation_flags (GTlsClientConnection *conn,
GTlsCertificateFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketConnectable *g_tls_client_connection_get_server_identity (GTlsClientConnection *conn);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_client_connection_set_server_identity (GTlsClientConnection *conn,
GSocketConnectable *identity);
-GLIB_DEPRECATED_IN_2_56
+GIO_DEPRECATED_IN_2_56
gboolean g_tls_client_connection_get_use_ssl3 (GTlsClientConnection *conn);
-GLIB_DEPRECATED_IN_2_56
+GIO_DEPRECATED_IN_2_56
void g_tls_client_connection_set_use_ssl3 (GTlsClientConnection *conn,
gboolean use_ssl3);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_tls_client_connection_get_accepted_cas (GTlsClientConnection *conn);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_tls_client_connection_copy_session_state (GTlsClientConnection *conn,
GTlsClientConnection *source);
diff --git a/gio/gtlsconnection.h b/gio/gtlsconnection.h
index ac0ce733c7..a266d61bb2 100644
--- a/gio/gtlsconnection.h
+++ b/gio/gtlsconnection.h
@@ -96,87 +96,87 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gpointer padding[6];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_connection_get_type (void) G_GNUC_CONST;
-GLIB_DEPRECATED
+GIO_DEPRECATED
void g_tls_connection_set_use_system_certdb (GTlsConnection *conn,
gboolean use_system_certdb);
-GLIB_DEPRECATED
+GIO_DEPRECATED
gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_connection_set_database (GTlsConnection *conn,
GTlsDatabase *database);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsDatabase * g_tls_connection_get_database (GTlsConnection *conn);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_connection_set_certificate (GTlsConnection *conn,
GTlsCertificate *certificate);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate *g_tls_connection_get_certificate (GTlsConnection *conn);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_connection_set_interaction (GTlsConnection *conn,
GTlsInteraction *interaction);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsInteraction * g_tls_connection_get_interaction (GTlsConnection *conn);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate *g_tls_connection_get_peer_certificate (GTlsConnection *conn);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificateFlags g_tls_connection_get_peer_certificate_errors (GTlsConnection *conn);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_connection_set_require_close_notify (GTlsConnection *conn,
gboolean
require_close_notify);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_tls_connection_get_require_close_notify (GTlsConnection *conn);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_60
+GIO_DEPRECATED_IN_2_60
void g_tls_connection_set_rehandshake_mode (GTlsConnection *conn,
GTlsRehandshakeMode mode);
-GLIB_DEPRECATED_IN_2_60
+GIO_DEPRECATED_IN_2_60
GTlsRehandshakeMode g_tls_connection_get_rehandshake_mode (GTlsConnection *conn);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
void g_tls_connection_set_advertised_protocols (GTlsConnection *conn,
const gchar * const *protocols);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
const gchar * g_tls_connection_get_negotiated_protocol (GTlsConnection *conn);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
gboolean g_tls_connection_get_channel_binding_data (GTlsConnection *conn,
GTlsChannelBindingType type,
GByteArray *data,
GError **error);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_tls_connection_handshake (GTlsConnection *conn,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_connection_handshake_async (GTlsConnection *conn,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_tls_connection_handshake_finish (GTlsConnection *conn,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
GTlsProtocolVersion g_tls_connection_get_protocol_version (GTlsConnection *conn);
-GLIB_AVAILABLE_IN_2_70
+GIO_AVAILABLE_IN_2_70
gchar * g_tls_connection_get_ciphersuite_name (GTlsConnection *conn);
/**
@@ -187,7 +187,7 @@ gchar * g_tls_connection_get_ciphersuite_name (GTlsConnecti
* domains.
*/
#define G_TLS_ERROR (g_tls_error_quark ())
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GQuark g_tls_error_quark (void);
/**
@@ -200,11 +200,11 @@ GQuark g_tls_error_quark (void);
* Since: 2.66
*/
#define G_TLS_CHANNEL_BINDING_ERROR (g_tls_channel_binding_error_quark ())
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
GQuark g_tls_channel_binding_error_quark (void);
/*< protected >*/
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_tls_connection_emit_accept_certificate (GTlsConnection *conn,
GTlsCertificate *peer_cert,
GTlsCertificateFlags errors);
diff --git a/gio/gtlsdatabase.h b/gio/gtlsdatabase.h
index 9767eca066..4ae6dc330c 100644
--- a/gio/gtlsdatabase.h
+++ b/gio/gtlsdatabase.h
@@ -145,10 +145,10 @@ struct _GTlsDatabaseClass
gpointer padding[16];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_database_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificateFlags g_tls_database_verify_chain (GTlsDatabase *self,
GTlsCertificate *chain,
const gchar *purpose,
@@ -158,7 +158,7 @@ GTlsCertificateFlags g_tls_database_verify_chain (GTlsD
GCancellable
*cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_database_verify_chain_async (GTlsDatabase *self,
GTlsCertificate *chain,
const gchar *purpose,
@@ -169,16 +169,16 @@ void g_tls_database_verify_chain_async (GTlsD
GAsyncReadyCallback callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificateFlags g_tls_database_verify_chain_finish (GTlsDatabase *self,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gchar* g_tls_database_create_certificate_handle (GTlsDatabase *self,
GTlsCertificate
*certificate);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate* g_tls_database_lookup_certificate_for_handle (GTlsDatabase *self,
const gchar *handle,
GTlsInteraction
*interaction,
@@ -186,7 +186,7 @@ GTlsCertificate* g_tls_database_lookup_certificate_for_handle (GTlsD
GCancellable
*cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_database_lookup_certificate_for_handle_async (GTlsDatabase *self,
const gchar *handle,
GTlsInteraction
*interaction,
@@ -195,12 +195,12 @@ void g_tls_database_lookup_certificate_for_handle_async (GTlsD
GAsyncReadyCallback callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate* g_tls_database_lookup_certificate_for_handle_finish (GTlsDatabase *self,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate* g_tls_database_lookup_certificate_issuer (GTlsDatabase *self,
GTlsCertificate
*certificate,
GTlsInteraction
*interaction,
@@ -208,7 +208,7 @@ GTlsCertificate* g_tls_database_lookup_certificate_issuer (GTlsD
GCancellable
*cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_database_lookup_certificate_issuer_async (GTlsDatabase *self,
GTlsCertificate
*certificate,
GTlsInteraction
*interaction,
@@ -217,12 +217,12 @@ void g_tls_database_lookup_certificate_issuer_async (GTlsD
GAsyncReadyCallback callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsCertificate* g_tls_database_lookup_certificate_issuer_finish (GTlsDatabase *self,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList* g_tls_database_lookup_certificates_issued_by (GTlsDatabase *self,
GByteArray
*issuer_raw_dn,
GTlsInteraction
*interaction,
@@ -230,7 +230,7 @@ GList* g_tls_database_lookup_certificates_issued_by (GTlsD
GCancellable
*cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_database_lookup_certificates_issued_by_async (GTlsDatabase *self,
GByteArray
*issuer_raw_dn,
GTlsInteraction
*interaction,
@@ -239,7 +239,7 @@ void g_tls_database_lookup_certificates_issued_by_async (GTls
GAsyncReadyCallback
callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList* g_tls_database_lookup_certificates_issued_by_finish (GTlsDatabase *self,
GAsyncResult *result,
GError **error);
diff --git a/gio/gtlsfiledatabase.h b/gio/gtlsfiledatabase.h
index 1eb3deea7b..57db68e4b7 100644
--- a/gio/gtlsfiledatabase.h
+++ b/gio/gtlsfiledatabase.h
@@ -48,10 +48,10 @@ struct _GTlsFileDatabaseInterface
gpointer padding[8];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_file_database_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsDatabase* g_tls_file_database_new (const gchar *anchors,
GError **error);
diff --git a/gio/gtlsinteraction.h b/gio/gtlsinteraction.h
index 217d8cfd2d..68e3662ba2 100644
--- a/gio/gtlsinteraction.h
+++ b/gio/gtlsinteraction.h
@@ -91,48 +91,48 @@ struct _GTlsInteractionClass
gpointer padding[21];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_interaction_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsInteractionResult g_tls_interaction_invoke_ask_password (GTlsInteraction *interaction,
GTlsPassword *password,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsInteractionResult g_tls_interaction_ask_password (GTlsInteraction *interaction,
GTlsPassword *password,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_interaction_ask_password_async (GTlsInteraction *interaction,
GTlsPassword *password,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsInteractionResult g_tls_interaction_ask_password_finish (GTlsInteraction *interaction,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GTlsInteractionResult g_tls_interaction_invoke_request_certificate (GTlsInteraction
*interaction,
GTlsConnection
*connection,
GTlsCertificateRequestFlags flags,
GCancellable
*cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GTlsInteractionResult g_tls_interaction_request_certificate (GTlsInteraction
*interaction,
GTlsConnection
*connection,
GTlsCertificateRequestFlags flags,
GCancellable
*cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
void g_tls_interaction_request_certificate_async (GTlsInteraction
*interaction,
GTlsConnection
*connection,
GTlsCertificateRequestFlags flags,
@@ -140,7 +140,7 @@ void g_tls_interaction_request_certificate_async (GTlsInterac
GAsyncReadyCallback callback,
gpointer
user_data);
-GLIB_AVAILABLE_IN_2_40
+GIO_AVAILABLE_IN_2_40
GTlsInteractionResult g_tls_interaction_request_certificate_finish (GTlsInteraction
*interaction,
GAsyncResult *result,
GError **error);
diff --git a/gio/gtlspassword.h b/gio/gtlspassword.h
index 3eaad12ff2..a33ec731d9 100644
--- a/gio/gtlspassword.h
+++ b/gio/gtlspassword.h
@@ -78,41 +78,41 @@ struct _GTlsPasswordClass
gpointer padding[4];
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_password_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsPassword * g_tls_password_new (GTlsPasswordFlags flags,
const gchar *description);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const guchar * g_tls_password_get_value (GTlsPassword *password,
gsize *length);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_password_set_value (GTlsPassword *password,
const guchar *value,
gssize length);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_password_set_value_full (GTlsPassword *password,
guchar *value,
gssize length,
GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GTlsPasswordFlags g_tls_password_get_flags (GTlsPassword *password);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_password_set_flags (GTlsPassword *password,
GTlsPasswordFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar* g_tls_password_get_description (GTlsPassword *password);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_password_set_description (GTlsPassword *password,
const gchar *description);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar * g_tls_password_get_warning (GTlsPassword *password);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_tls_password_set_warning (GTlsPassword *password,
const gchar *warning);
diff --git a/gio/gtlsserverconnection.h b/gio/gtlsserverconnection.h
index d2c83457a7..f84c25b86a 100644
--- a/gio/gtlsserverconnection.h
+++ b/gio/gtlsserverconnection.h
@@ -58,10 +58,10 @@ struct _GTlsServerConnectionInterface
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_tls_server_connection_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIOStream * g_tls_server_connection_new (GIOStream *base_io_stream,
GTlsCertificate *certificate,
GError **error);
diff --git a/gio/gunixconnection.h b/gio/gunixconnection.h
index d5c41cb8ff..e08e8189c6 100644
--- a/gio/gunixconnection.h
+++ b/gio/gunixconnection.h
@@ -56,43 +56,43 @@ struct _GUnixConnection
GUnixConnectionPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_connection_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_connection_send_fd (GUnixConnection *connection,
gint fd,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_connection_receive_fd (GUnixConnection *connection,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_connection_send_credentials (GUnixConnection *connection,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_unix_connection_send_credentials_async (GUnixConnection *connection,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
gboolean g_unix_connection_send_credentials_finish (GUnixConnection *connection,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
GCredentials *g_unix_connection_receive_credentials (GUnixConnection *connection,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
void g_unix_connection_receive_credentials_async (GUnixConnection *connection,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCredentials *g_unix_connection_receive_credentials_finish (GUnixConnection *connection,
GAsyncResult *result,
GError **error);
diff --git a/gio/gunixcredentialsmessage.h b/gio/gunixcredentialsmessage.h
index ad70f74c3e..cd42d254e3 100644
--- a/gio/gunixcredentialsmessage.h
+++ b/gio/gunixcredentialsmessage.h
@@ -72,16 +72,16 @@ struct _GUnixCredentialsMessage
GUnixCredentialsMessagePrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_credentials_message_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketControlMessage *g_unix_credentials_message_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketControlMessage *g_unix_credentials_message_new_with_credentials (GCredentials *credentials);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GCredentials *g_unix_credentials_message_get_credentials (GUnixCredentialsMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_credentials_message_is_supported (void);
G_END_DECLS
diff --git a/gio/gunixfdlist.h b/gio/gunixfdlist.h
index 1e625b01a5..df5587eea9 100644
--- a/gio/gunixfdlist.h
+++ b/gio/gunixfdlist.h
@@ -63,32 +63,32 @@ struct _GUnixFDList
GUnixFDListPrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_fd_list_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GUnixFDList * g_unix_fd_list_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GUnixFDList * g_unix_fd_list_new_from_array (const gint *fds,
gint n_fds);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_fd_list_append (GUnixFDList *list,
gint fd,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_fd_list_get_length (GUnixFDList *list);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_fd_list_get (GUnixFDList *list,
gint index_,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gint * g_unix_fd_list_peek_fds (GUnixFDList *list,
gint *length);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint * g_unix_fd_list_steal_fds (GUnixFDList *list,
gint *length);
diff --git a/gio/gunixfdmessage.h b/gio/gunixfdmessage.h
index 73b0f2ce3b..0424b1150d 100644
--- a/gio/gunixfdmessage.h
+++ b/gio/gunixfdmessage.h
@@ -63,20 +63,20 @@ struct _GUnixFDMessage
GUnixFDMessagePrivate *priv;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_fd_message_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketControlMessage * g_unix_fd_message_new_with_fd_list (GUnixFDList *fd_list);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketControlMessage * g_unix_fd_message_new (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GUnixFDList * g_unix_fd_message_get_fd_list (GUnixFDMessage *message);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint * g_unix_fd_message_steal_fds (GUnixFDMessage *message,
gint *length);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_fd_message_append_fd (GUnixFDMessage *message,
gint fd,
GError **error);
diff --git a/gio/gunixinputstream.h b/gio/gunixinputstream.h
index 8c0c720fa4..78b2cbb9ab 100644
--- a/gio/gunixinputstream.h
+++ b/gio/gunixinputstream.h
@@ -66,18 +66,18 @@ struct _GUnixInputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream * g_unix_input_stream_new (gint fd,
gboolean close_fd);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_unix_input_stream_set_close_fd (GUnixInputStream *stream,
gboolean close_fd);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_input_stream_get_close_fd (GUnixInputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_input_stream_get_fd (GUnixInputStream *stream);
G_END_DECLS
diff --git a/gio/gunixmounts.h b/gio/gunixmounts.h
index 7fa48235ae..11fc5f6d9d 100644
--- a/gio/gunixmounts.h
+++ b/gio/gunixmounts.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
typedef struct _GUnixMountEntry GUnixMountEntry;
#define G_TYPE_UNIX_MOUNT_ENTRY (g_unix_mount_entry_get_type ())
-GLIB_AVAILABLE_IN_2_54
+GIO_AVAILABLE_IN_2_54
GType g_unix_mount_entry_get_type (void) G_GNUC_CONST;
/**
@@ -48,7 +48,7 @@ GType g_unix_mount_entry_get_type (void) G_GNUC_CONST;
typedef struct _GUnixMountPoint GUnixMountPoint;
#define G_TYPE_UNIX_MOUNT_POINT (g_unix_mount_point_get_type ())
-GLIB_AVAILABLE_IN_2_54
+GIO_AVAILABLE_IN_2_54
GType g_unix_mount_point_get_type (void) G_GNUC_CONST;
/**
@@ -66,105 +66,105 @@ typedef struct _GUnixMountMonitorClass GUnixMountMonitorClass;
#define G_IS_UNIX_MOUNT_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_MOUNT_MONITOR))
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUnixMountMonitor, g_object_unref)
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_unix_mount_free (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_2_54
+GIO_AVAILABLE_IN_2_54
GUnixMountEntry *g_unix_mount_copy (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_unix_mount_point_free (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_2_54
+GIO_AVAILABLE_IN_2_54
GUnixMountPoint *g_unix_mount_point_copy (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_mount_compare (GUnixMountEntry *mount1,
GUnixMountEntry *mount2);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_unix_mount_get_mount_path (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_unix_mount_get_device_path (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_2_60
+GIO_AVAILABLE_IN_2_60
const char * g_unix_mount_get_root_path (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_unix_mount_get_fs_type (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_2_58
+GIO_AVAILABLE_IN_2_58
const char * g_unix_mount_get_options (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_is_readonly (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_is_system_internal (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_guess_can_eject (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_unix_mount_guess_name (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_unix_mount_guess_icon (GUnixMountEntry *mount_entry);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_unix_mount_guess_symbolic_icon (GUnixMountEntry *mount_entry);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUnixMountEntry, g_unix_mount_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUnixMountPoint, g_unix_mount_point_free)
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_mount_point_compare (GUnixMountPoint *mount1,
GUnixMountPoint *mount2);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_unix_mount_point_get_mount_path (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_unix_mount_point_get_device_path (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_unix_mount_point_get_fs_type (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
const char * g_unix_mount_point_get_options (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_point_is_readonly (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_point_is_user_mountable (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_point_is_loopback (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_point_guess_can_eject (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_unix_mount_point_guess_name (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_unix_mount_point_guess_icon (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_unix_mount_point_guess_symbolic_icon (GUnixMountPoint *mount_point);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_unix_mount_points_get (guint64 *time_read);
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
GUnixMountPoint *g_unix_mount_point_at (const char *mount_path,
guint64 *time_read);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_unix_mounts_get (guint64 *time_read);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GUnixMountEntry *g_unix_mount_at (const char *mount_path,
guint64 *time_read);
-GLIB_AVAILABLE_IN_2_52
+GIO_AVAILABLE_IN_2_52
GUnixMountEntry *g_unix_mount_for (const char *file_path,
guint64 *time_read);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mounts_changed_since (guint64 time);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_mount_points_changed_since (guint64 time);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_mount_monitor_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_44
+GIO_AVAILABLE_IN_2_44
GUnixMountMonitor *g_unix_mount_monitor_get (void);
-GLIB_DEPRECATED_IN_2_44_FOR(g_unix_mount_monitor_get)
+GIO_DEPRECATED_IN_2_44_FOR(g_unix_mount_monitor_get)
GUnixMountMonitor *g_unix_mount_monitor_new (void);
-GLIB_DEPRECATED_IN_2_44
+GIO_DEPRECATED_IN_2_44
void g_unix_mount_monitor_set_rate_limit (GUnixMountMonitor *mount_monitor,
int limit_msec);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_is_mount_path_system_internal (const char *mount_path);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
gboolean g_unix_is_system_fs_type (const char *fs_type);
-GLIB_AVAILABLE_IN_2_56
+GIO_AVAILABLE_IN_2_56
gboolean g_unix_is_system_device_path (const char *device_path);
G_END_DECLS
diff --git a/gio/gunixoutputstream.h b/gio/gunixoutputstream.h
index 1a7ee08dde..37aa225842 100644
--- a/gio/gunixoutputstream.h
+++ b/gio/gunixoutputstream.h
@@ -66,18 +66,18 @@ struct _GUnixOutputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream * g_unix_output_stream_new (gint fd,
gboolean close_fd);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_unix_output_stream_set_close_fd (GUnixOutputStream *stream,
gboolean close_fd);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_output_stream_get_close_fd (GUnixOutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gint g_unix_output_stream_get_fd (GUnixOutputStream *stream);
G_END_DECLS
diff --git a/gio/gunixsocketaddress.h b/gio/gunixsocketaddress.h
index 1a24e57bd9..705674b0f9 100644
--- a/gio/gunixsocketaddress.h
+++ b/gio/gunixsocketaddress.h
@@ -54,28 +54,28 @@ struct _GUnixSocketAddressClass
GSocketAddressClass parent_class;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_unix_socket_address_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_unix_socket_address_new (const gchar *path);
-GLIB_DEPRECATED_FOR(g_unix_socket_address_new_with_type)
+GIO_DEPRECATED_FOR(g_unix_socket_address_new_with_type)
GSocketAddress *g_unix_socket_address_new_abstract (const gchar *path,
gint path_len);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GSocketAddress *g_unix_socket_address_new_with_type (const gchar *path,
gint path_len,
GUnixSocketAddressType type);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const char * g_unix_socket_address_get_path (GUnixSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gsize g_unix_socket_address_get_path_len (GUnixSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GUnixSocketAddressType g_unix_socket_address_get_address_type (GUnixSocketAddress *address);
-GLIB_DEPRECATED
+GIO_DEPRECATED
gboolean g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_unix_socket_address_abstract_names_supported (void);
G_END_DECLS
diff --git a/gio/gvfs.h b/gio/gvfs.h
index a1eb51fb2b..cbe9792a24 100644
--- a/gio/gvfs.h
+++ b/gio/gvfs.h
@@ -128,30 +128,30 @@ struct _GVfsClass
void (*_g_reserved6) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_vfs_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_vfs_is_active (GVfs *vfs);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_vfs_get_file_for_path (GVfs *vfs,
const char *path);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_vfs_get_file_for_uri (GVfs *vfs,
const char *uri);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
const gchar* const * g_vfs_get_supported_uri_schemes (GVfs *vfs);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_vfs_parse_name (GVfs *vfs,
const char *parse_name);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVfs * g_vfs_get_default (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVfs * g_vfs_get_local (void);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
gboolean g_vfs_register_uri_scheme (GVfs *vfs,
const char *scheme,
GVfsFileLookupFunc uri_func,
@@ -160,7 +160,7 @@ gboolean g_vfs_register_uri_scheme (GVfs *vfs,
GVfsFileLookupFunc parse_name_func,
gpointer parse_name_data,
GDestroyNotify parse_name_destroy);
-GLIB_AVAILABLE_IN_2_50
+GIO_AVAILABLE_IN_2_50
gboolean g_vfs_unregister_uri_scheme (GVfs *vfs,
const char *scheme);
diff --git a/gio/gvolume.h b/gio/gvolume.h
index 5c71cdb40f..2d6e14eff1 100644
--- a/gio/gvolume.h
+++ b/gio/gvolume.h
@@ -39,7 +39,7 @@ G_BEGIN_DECLS
*
* Deprecated: 2.58: Do not use, HAL is deprecated.
*/
-#define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi" GLIB_DEPRECATED_MACRO_IN_2_58
+#define G_VOLUME_IDENTIFIER_KIND_HAL_UDI "hal-udi" GIO_DEPRECATED_MACRO_IN_2_58
/**
* G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE:
@@ -183,71 +183,71 @@ struct _GVolumeIface
GIcon * (* get_symbolic_icon) (GVolume *volume);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_volume_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_volume_get_name (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_volume_get_icon (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GIcon * g_volume_get_symbolic_icon (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_volume_get_uuid (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GDrive * g_volume_get_drive (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GMount * g_volume_get_mount (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_volume_can_mount (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_volume_can_eject (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_volume_should_automount (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_volume_mount (GVolume *volume,
GMountMountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_volume_mount_finish (GVolume *volume,
GAsyncResult *result,
GError **error);
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation)
+GIO_DEPRECATED_FOR(g_volume_eject_with_operation)
void g_volume_eject (GVolume *volume,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_DEPRECATED_FOR(g_volume_eject_with_operation_finish)
+GIO_DEPRECATED_FOR(g_volume_eject_with_operation_finish)
gboolean g_volume_eject_finish (GVolume *volume,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char * g_volume_get_identifier (GVolume *volume,
const char *kind);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
char ** g_volume_enumerate_identifiers (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFile * g_volume_get_activation_root (GVolume *volume);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_volume_eject_with_operation (GVolume *volume,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_volume_eject_with_operation_finish (GVolume *volume,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_32
+GIO_AVAILABLE_IN_2_32
const gchar *g_volume_get_sort_key (GVolume *volume);
G_END_DECLS
diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h
index 88294da726..11bd3319b3 100644
--- a/gio/gvolumemonitor.h
+++ b/gio/gvolumemonitor.h
@@ -130,25 +130,25 @@ struct _GVolumeMonitorClass
void (*_g_reserved6) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_volume_monitor_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVolumeMonitor *g_volume_monitor_get (void);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_volume_monitor_get_volumes (GVolumeMonitor *volume_monitor);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GList * g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GVolume * g_volume_monitor_get_volume_for_uuid (GVolumeMonitor *volume_monitor,
const char *uuid);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor,
const char *uuid);
-GLIB_DEPRECATED
+GIO_DEPRECATED
GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount);
G_END_DECLS
diff --git a/gio/gwin32inputstream.h b/gio/gwin32inputstream.h
index 2f4f4f8d64..8dde9e8033 100644
--- a/gio/gwin32inputstream.h
+++ b/gio/gwin32inputstream.h
@@ -67,18 +67,18 @@ struct _GWin32InputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_win32_input_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GInputStream * g_win32_input_stream_new (void *handle,
gboolean close_handle);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_win32_input_stream_set_close_handle (GWin32InputStream *stream,
gboolean close_handle);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_win32_input_stream_get_close_handle (GWin32InputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void *g_win32_input_stream_get_handle (GWin32InputStream *stream);
G_END_DECLS
diff --git a/gio/gwin32outputstream.h b/gio/gwin32outputstream.h
index 6b21849f90..d64fdc176d 100644
--- a/gio/gwin32outputstream.h
+++ b/gio/gwin32outputstream.h
@@ -67,18 +67,18 @@ struct _GWin32OutputStreamClass
void (*_g_reserved5) (void);
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_win32_output_stream_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GOutputStream * g_win32_output_stream_new (void *handle,
gboolean close_handle);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_win32_output_stream_set_close_handle (GWin32OutputStream *stream,
gboolean close_handle);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
gboolean g_win32_output_stream_get_close_handle (GWin32OutputStream *stream);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void *g_win32_output_stream_get_handle (GWin32OutputStream *stream);
G_END_DECLS
diff --git a/gio/gwin32registrykey.h b/gio/gwin32registrykey.h
index 63ab9a9bc8..e2b25da464 100644
--- a/gio/gwin32registrykey.h
+++ b/gio/gwin32registrykey.h
@@ -136,112 +136,112 @@ struct _GWin32RegistryValueIter {
gsize value_data_expanded_u8_size;
};
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GWin32RegistrySubkeyIter *g_win32_registry_subkey_iter_copy (const GWin32RegistrySubkeyIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_win32_registry_subkey_iter_free (GWin32RegistrySubkeyIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_win32_registry_subkey_iter_assign (GWin32RegistrySubkeyIter *iter,
const GWin32RegistrySubkeyIter *other);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GType g_win32_registry_subkey_iter_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GWin32RegistryValueIter *g_win32_registry_value_iter_copy (const GWin32RegistryValueIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_win32_registry_value_iter_free (GWin32RegistryValueIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_win32_registry_value_iter_assign (GWin32RegistryValueIter *iter,
const GWin32RegistryValueIter *other);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GType g_win32_registry_value_iter_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GType g_win32_registry_key_get_type (void);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GWin32RegistryKey *g_win32_registry_key_new (const gchar *path,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GWin32RegistryKey *g_win32_registry_key_new_w (const gunichar2 *path,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GWin32RegistryKey *g_win32_registry_key_get_child (GWin32RegistryKey *key,
const gchar *subkey,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
GWin32RegistryKey *g_win32_registry_key_get_child_w (GWin32RegistryKey *key,
const gunichar2 *subkey,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_subkey_iter_init (GWin32RegistrySubkeyIter *iter,
GWin32RegistryKey *key,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_win32_registry_subkey_iter_clear (GWin32RegistrySubkeyIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gsize g_win32_registry_subkey_iter_n_subkeys (GWin32RegistrySubkeyIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_subkey_iter_next (GWin32RegistrySubkeyIter *iter,
gboolean skip_errors,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_subkey_iter_get_name (GWin32RegistrySubkeyIter *iter,
const gchar **subkey_name,
gsize
*subkey_name_len,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_subkey_iter_get_name_w (GWin32RegistrySubkeyIter *iter,
const gunichar2 **subkey_name,
gsize
*subkey_name_len,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_value_iter_init (GWin32RegistryValueIter *iter,
GWin32RegistryKey *key,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_win32_registry_value_iter_clear (GWin32RegistryValueIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gsize g_win32_registry_value_iter_n_values (GWin32RegistryValueIter *iter);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_value_iter_next (GWin32RegistryValueIter *iter,
gboolean skip_errors,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_value_iter_get_value_type (GWin32RegistryValueIter *iter,
GWin32RegistryValueType *value_type,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_value_iter_get_name (GWin32RegistryValueIter *iter,
gchar **value_name,
gsize
*value_name_len,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_value_iter_get_name_w (GWin32RegistryValueIter *iter,
gunichar2 **value_name,
gsize
*value_name_len,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_value_iter_get_data (GWin32RegistryValueIter *iter,
gboolean auto_expand,
gpointer *value_data,
gsize
*value_data_size,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_value_iter_get_data_w (GWin32RegistryValueIter *iter,
gboolean auto_expand,
gpointer *value_data,
gsize
*value_data_size,
GError **error);
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
gboolean g_win32_registry_key_get_value (GWin32RegistryKey *key,
const gchar * const *mui_dll_dirs,
gboolean auto_expand,
@@ -251,7 +251,7 @@ gboolean g_win32_registry_key_get_value (GWin32RegistryKey
gsize
*value_data_size,
GError **error);
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
gboolean g_win32_registry_key_get_value_w (GWin32RegistryKey *key,
const gunichar2 * const *mui_dll_dirs,
gboolean auto_expand,
@@ -261,29 +261,29 @@ gboolean g_win32_registry_key_get_value_w (GWin32RegistryKey
gsize
*value_data_size,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
const gchar *g_win32_registry_key_get_path (GWin32RegistryKey *key);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
const gunichar2 *g_win32_registry_key_get_path_w (GWin32RegistryKey *key);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_key_watch (GWin32RegistryKey *key,
gboolean
watch_children,
GWin32RegistryKeyWatcherFlags watch_flags,
GWin32RegistryKeyWatchCallbackFunc callback,
gpointer user_data,
GError **error);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
gboolean g_win32_registry_key_has_changed (GWin32RegistryKey *key);
-GLIB_AVAILABLE_IN_2_46
+GIO_AVAILABLE_IN_2_46
void g_win32_registry_key_erase_change_indicator (GWin32RegistryKey *key);
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
const gunichar2 * const *g_win32_registry_get_os_dirs_w (void);
-GLIB_AVAILABLE_IN_2_66
+GIO_AVAILABLE_IN_2_66
const gchar * const *g_win32_registry_get_os_dirs (void);
G_END_DECLS
diff --git a/gio/gzlibcompressor.h b/gio/gzlibcompressor.h
index 1a9380e088..b8a99eaac3 100644
--- a/gio/gzlibcompressor.h
+++ b/gio/gzlibcompressor.h
@@ -46,16 +46,16 @@ struct _GZlibCompressorClass
GObjectClass parent_class;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_zlib_compressor_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GZlibCompressor *g_zlib_compressor_new (GZlibCompressorFormat format,
int level);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_zlib_compressor_get_file_info (GZlibCompressor *compressor);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
void g_zlib_compressor_set_file_info (GZlibCompressor *compressor,
GFileInfo *file_info);
diff --git a/gio/gzlibdecompressor.h b/gio/gzlibdecompressor.h
index 464131781b..ef97439f21 100644
--- a/gio/gzlibdecompressor.h
+++ b/gio/gzlibdecompressor.h
@@ -46,13 +46,13 @@ struct _GZlibDecompressorClass
GObjectClass parent_class;
};
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GType g_zlib_decompressor_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GZlibDecompressor *g_zlib_decompressor_new (GZlibCompressorFormat format);
-GLIB_AVAILABLE_IN_ALL
+GIO_AVAILABLE_IN_ALL
GFileInfo *g_zlib_decompressor_get_file_info (GZlibDecompressor *decompressor);
G_END_DECLS
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index f324882abb..972d8ad631 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -901,10 +901,10 @@ g_module_build_path (const gchar *directory,
/* Binary compatibility versions. Not for newly compiled code. */
-_GLIB_EXTERN GModule * g_module_open_utf8 (const gchar *file_name,
- GModuleFlags flags);
+_GMODULE_EXTERN GModule * g_module_open_utf8 (const gchar *file_name,
+ GModuleFlags flags);
-_GLIB_EXTERN const gchar *g_module_name_utf8 (GModule *module);
+_GMODULE_EXTERN const gchar *g_module_name_utf8 (GModule *module);
GModule*
g_module_open_utf8 (const gchar *file_name,
diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h
index ec14f4e10d..03ac91d10f 100644
--- a/gmodule/gmodule.h
+++ b/gmodule/gmodule.h
@@ -69,8 +69,8 @@ typedef struct _GModule GModule;
typedef const gchar* (*GModuleCheckInit) (GModule *module);
typedef void (*GModuleUnload) (GModule *module);
-#define G_MODULE_ERROR g_module_error_quark () GLIB_AVAILABLE_MACRO_IN_2_70
-GLIB_AVAILABLE_IN_2_70
+#define G_MODULE_ERROR g_module_error_quark () GMODULE_AVAILABLE_MACRO_IN_2_70
+GMODULE_AVAILABLE_IN_2_70
GQuark g_module_error_quark (void);
/**
@@ -87,42 +87,42 @@ typedef enum
G_MODULE_ERROR_FAILED,
G_MODULE_ERROR_CHECK_FAILED,
} GModuleError
-GLIB_AVAILABLE_ENUMERATOR_IN_2_70;
+GMODULE_AVAILABLE_ENUMERATOR_IN_2_70;
/* return TRUE if dynamic module loading is supported */
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
gboolean g_module_supported (void) G_GNUC_CONST;
/* open a module 'file_name' and return handle, which is NULL on error */
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
GModule* g_module_open (const gchar *file_name,
GModuleFlags flags);
-GLIB_AVAILABLE_IN_2_70
+GMODULE_AVAILABLE_IN_2_70
GModule *g_module_open_full (const gchar *file_name,
GModuleFlags flags,
GError **error);
/* close a previously opened module, returns TRUE on success */
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
gboolean g_module_close (GModule *module);
/* make a module resident so g_module_close on it will be ignored */
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
void g_module_make_resident (GModule *module);
/* query the last module error as a string */
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
const gchar * g_module_error (void);
/* retrieve a symbol pointer from 'module', returns TRUE on success */
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
gboolean g_module_symbol (GModule *module,
const gchar *symbol_name,
gpointer *symbol);
/* retrieve the file name from an existing module */
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
const gchar * g_module_name (GModule *module);
/* Build the actual file name containing a module. 'directory' is the
@@ -136,7 +136,7 @@ const gchar * g_module_name (GModule *module);
*
* No checks are made that the file exists, or is of correct type.
*/
-GLIB_AVAILABLE_IN_ALL
+GMODULE_AVAILABLE_IN_ALL
gchar* g_module_build_path (const gchar *directory,
const gchar *module_name);
diff --git a/gobject/gbinding.h b/gobject/gbinding.h
index 78aa315f37..8504de21da 100644
--- a/gobject/gbinding.h
+++ b/gobject/gbinding.h
@@ -104,35 +104,35 @@ typedef enum { /*< prefix=G_BINDING >*/
G_BINDING_INVERT_BOOLEAN = 1 << 2
} GBindingFlags;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_binding_flags_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_binding_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GBindingFlags g_binding_get_flags (GBinding *binding);
-GLIB_DEPRECATED_IN_2_68_FOR(g_binding_dup_source)
+GOBJECT_DEPRECATED_IN_2_68_FOR(g_binding_dup_source)
GObject * g_binding_get_source (GBinding *binding);
-GLIB_AVAILABLE_IN_2_68
+GOBJECT_AVAILABLE_IN_2_68
GObject * g_binding_dup_source (GBinding *binding);
-GLIB_DEPRECATED_IN_2_68_FOR(g_binding_dup_target)
+GOBJECT_DEPRECATED_IN_2_68_FOR(g_binding_dup_target)
GObject * g_binding_get_target (GBinding *binding);
-GLIB_AVAILABLE_IN_2_68
+GOBJECT_AVAILABLE_IN_2_68
GObject * g_binding_dup_target (GBinding *binding);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_binding_get_source_property (GBinding *binding);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_binding_get_target_property (GBinding *binding);
-GLIB_AVAILABLE_IN_2_38
+GOBJECT_AVAILABLE_IN_2_38
void g_binding_unbind (GBinding *binding);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GBinding *g_object_bind_property (gpointer source,
const gchar *source_property,
gpointer target,
const gchar *target_property,
GBindingFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GBinding *g_object_bind_property_full (gpointer source,
const gchar *source_property,
gpointer target,
@@ -142,7 +142,7 @@ GBinding *g_object_bind_property_full (gpointer source,
GBindingTransformFunc transform_from,
gpointer user_data,
GDestroyNotify notify);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GBinding *g_object_bind_property_with_closures (gpointer source,
const gchar *source_property,
gpointer target,
diff --git a/gobject/gbindinggroup.h b/gobject/gbindinggroup.h
index 472ebc5b38..4cbdfe480b 100644
--- a/gobject/gbindinggroup.h
+++ b/gobject/gbindinggroup.h
@@ -46,22 +46,22 @@ G_BEGIN_DECLS
*/
typedef struct _GBindingGroup GBindingGroup;
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
GType g_binding_group_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
GBindingGroup *g_binding_group_new (void);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
gpointer g_binding_group_dup_source (GBindingGroup *self);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_binding_group_set_source (GBindingGroup *self,
gpointer source);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_binding_group_bind (GBindingGroup *self,
const gchar *source_property,
gpointer target,
const gchar *target_property,
GBindingFlags flags);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_binding_group_bind_full (GBindingGroup *self,
const gchar *source_property,
gpointer target,
@@ -71,7 +71,7 @@ void g_binding_group_bind_full (GBindingGroup *self,
GBindingTransformFunc transform_from,
gpointer user_data,
GDestroyNotify user_data_destroy);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_binding_group_bind_with_closures (GBindingGroup *self,
const gchar *source_property,
gpointer target,
diff --git a/gobject/gboxed.h b/gobject/gboxed.h
index c563dccfc5..d7b3d4e91e 100644
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.h
@@ -68,32 +68,32 @@ typedef void (*GBoxedFreeFunc) (gpointer boxed);
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_boxed_copy (GType boxed_type,
gconstpointer src_boxed);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_boxed_free (GType boxed_type,
gpointer boxed);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_boxed (GValue *value,
gconstpointer v_boxed);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_static_boxed (GValue *value,
gconstpointer v_boxed);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_take_boxed (GValue *value,
gconstpointer v_boxed);
-GLIB_DEPRECATED_FOR(g_value_take_boxed)
+GOBJECT_DEPRECATED_FOR(g_value_take_boxed)
void g_value_set_boxed_take_ownership (GValue *value,
gconstpointer v_boxed);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_value_get_boxed (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_value_dup_boxed (const GValue *value);
/* --- convenience --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_boxed_type_register_static (const gchar *name,
GBoxedCopyFunc boxed_copy,
GBoxedFreeFunc boxed_free);
@@ -114,9 +114,9 @@ GType g_boxed_type_register_static (const gchar *name,
*/
#define G_TYPE_VALUE (g_value_get_type ())
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_closure_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_value_get_type (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index 330a1cf70e..4519e11be1 100644
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.h
@@ -227,62 +227,62 @@ struct _GCClosure
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_cclosure_new (GCallback callback_func,
gpointer user_data,
GClosureNotify destroy_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_cclosure_new_swap (GCallback callback_func,
gpointer user_data,
GClosureNotify destroy_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_signal_type_cclosure_new (GType itype,
guint struct_offset);
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_closure_ref (GClosure *closure);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_sink (GClosure *closure);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_unref (GClosure *closure);
/* intimidating */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_closure_new_simple (guint sizeof_closure,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_add_finalize_notifier (GClosure *closure,
gpointer notify_data,
GClosureNotify notify_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_remove_finalize_notifier (GClosure *closure,
gpointer notify_data,
GClosureNotify notify_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_add_invalidate_notifier (GClosure *closure,
gpointer notify_data,
GClosureNotify notify_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_remove_invalidate_notifier (GClosure *closure,
gpointer notify_data,
GClosureNotify notify_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_add_marshal_guards (GClosure *closure,
gpointer pre_marshal_data,
GClosureNotify pre_marshal_notify,
gpointer post_marshal_data,
GClosureNotify post_marshal_notify);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_set_marshal (GClosure *closure,
GClosureMarshal marshal);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_set_meta_marshal (GClosure *closure,
gpointer marshal_data,
GClosureMarshal meta_marshal);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_invalidate (GClosure *closure);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_closure_invoke (GClosure *closure,
GValue /*out*/ *return_value,
guint n_param_values,
@@ -300,7 +300,7 @@ void g_closure_invoke (GClosure *closure,
- provide marshaller collection, virtually covering anything out there
*/
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_generic (GClosure *closure,
GValue *return_gvalue,
guint n_param_values,
@@ -308,7 +308,7 @@ void g_cclosure_marshal_generic (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_generic_va (GClosure *closure,
GValue *return_value,
gpointer instance,
diff --git a/gobject/genums.h b/gobject/genums.h
index b8fff52932..d253b15b12 100644
--- a/gobject/genums.h
+++ b/gobject/genums.h
@@ -217,39 +217,39 @@ struct _GFlagsValue
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GEnumValue* g_enum_get_value (GEnumClass *enum_class,
gint value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GEnumValue* g_enum_get_value_by_name (GEnumClass *enum_class,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GEnumValue* g_enum_get_value_by_nick (GEnumClass *enum_class,
const gchar *nick);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GFlagsValue* g_flags_get_first_value (GFlagsClass *flags_class,
guint value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GFlagsValue* g_flags_get_value_by_name (GFlagsClass *flags_class,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GFlagsValue* g_flags_get_value_by_nick (GFlagsClass *flags_class,
const gchar *nick);
-GLIB_AVAILABLE_IN_2_54
+GOBJECT_AVAILABLE_IN_2_54
gchar *g_enum_to_string (GType g_enum_type,
gint value);
-GLIB_AVAILABLE_IN_2_54
+GOBJECT_AVAILABLE_IN_2_54
gchar *g_flags_to_string (GType flags_type,
guint value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_enum (GValue *value,
gint v_enum);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gint g_value_get_enum (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_flags (GValue *value,
guint v_flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_value_get_flags (const GValue *value);
@@ -258,20 +258,20 @@ guint g_value_get_flags (const GValue *value);
/* const_static_values is a NULL terminated array of enum/flags
* values that is taken over!
*/
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_enum_register_static (const gchar *name,
const GEnumValue *const_static_values);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_flags_register_static (const gchar *name,
const GFlagsValue *const_static_values);
/* functions to complete the type information
* for enums/flags implemented by plugins
*/
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_enum_complete_type_info (GType g_enum_type,
GTypeInfo *info,
const GEnumValue *const_values);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_flags_complete_type_info (GType g_flags_type,
GTypeInfo *info,
const GFlagsValue *const_values);
@@ -292,7 +292,7 @@ void g_flags_complete_type_info (GType g_flags_type,
*/
#define G_DEFINE_ENUM_VALUE(EnumValue, EnumNick) \
{ EnumValue, #EnumValue, EnumNick } \
- GLIB_AVAILABLE_MACRO_IN_2_74
+ GOBJECT_AVAILABLE_MACRO_IN_2_74
/**
* G_DEFINE_ENUM_TYPE:
@@ -331,7 +331,7 @@ type_name ## _get_type (void) { \
} \
return g_define_type__static; \
} \
- GLIB_AVAILABLE_MACRO_IN_2_74
+ GOBJECT_AVAILABLE_MACRO_IN_2_74
/**
* G_DEFINE_FLAGS_TYPE:
@@ -374,7 +374,7 @@ type_name ## _get_type (void) { \
} \
return g_define_type__static; \
} \
- GLIB_AVAILABLE_MACRO_IN_2_74
+ GOBJECT_AVAILABLE_MACRO_IN_2_74
G_END_DECLS
diff --git a/gobject/glib-enumtypes.h.template b/gobject/glib-enumtypes.h.template
index 2a4b0e4f31..f907d9caee 100644
--- a/gobject/glib-enumtypes.h.template
+++ b/gobject/glib-enumtypes.h.template
@@ -13,7 +13,7 @@ G_BEGIN_DECLS
/*** END file-production ***/
/*** BEGIN value-header ***/
-GLIB_AVAILABLE_IN_2_60 GType @enum_name@_get_type (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_60 GType @enum_name@_get_type (void) G_GNUC_CONST;
#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
/*** END value-header ***/
diff --git a/gobject/glib-types.h b/gobject/glib-types.h
index e0922b4205..020f5d4f77 100644
--- a/gobject/glib-types.h
+++ b/gobject/glib-types.h
@@ -326,70 +326,70 @@ typedef gsize GType;
*/
#define G_TYPE_PATTERN_SPEC (g_pattern_spec_get_type ())
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_date_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_strv_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_gstring_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_hash_table_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_array_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_byte_array_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_ptr_array_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_bytes_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_variant_type_get_gtype (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_regex_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
+GOBJECT_AVAILABLE_IN_2_30
GType g_match_info_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_error_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_date_time_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_time_zone_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_io_channel_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_io_condition_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_variant_builder_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_40
+GOBJECT_AVAILABLE_IN_2_40
GType g_variant_dict_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_key_file_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
+GOBJECT_AVAILABLE_IN_2_30
GType g_main_loop_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
+GOBJECT_AVAILABLE_IN_2_30
GType g_main_context_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_30
+GOBJECT_AVAILABLE_IN_2_30
GType g_source_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
+GOBJECT_AVAILABLE_IN_2_36
GType g_pollfd_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
+GOBJECT_AVAILABLE_IN_2_36
GType g_thread_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
+GOBJECT_AVAILABLE_IN_2_36
GType g_checksum_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
+GOBJECT_AVAILABLE_IN_2_36
GType g_markup_parse_context_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_40
+GOBJECT_AVAILABLE_IN_2_40
GType g_mapped_file_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_44
+GOBJECT_AVAILABLE_IN_2_44
GType g_option_group_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_66
+GOBJECT_AVAILABLE_IN_2_66
GType g_uri_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_68
+GOBJECT_AVAILABLE_IN_2_68
GType g_tree_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_70
+GOBJECT_AVAILABLE_IN_2_70
GType g_pattern_spec_get_type (void) G_GNUC_CONST;
-GLIB_DEPRECATED_FOR('G_TYPE_VARIANT')
+GOBJECT_DEPRECATED_FOR('G_TYPE_VARIANT')
GType g_variant_get_gtype (void) G_GNUC_CONST;
G_END_DECLS
diff --git a/gobject/gmarshal.h b/gobject/gmarshal.h
index fdd6c042e1..96c7c4eee7 100644
--- a/gobject/gmarshal.h
+++ b/gobject/gmarshal.h
@@ -20,14 +20,14 @@
G_BEGIN_DECLS
/* VOID:VOID */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__VOIDv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -37,14 +37,14 @@ void g_cclosure_marshal_VOID__VOIDv (GClosure *closure,
GType *param_types);
/* VOID:BOOLEAN */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -54,14 +54,14 @@ void g_cclosure_marshal_VOID__BOOLEANv (GClosure *closure,
GType *param_types);
/* VOID:CHAR */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__CHARv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -71,14 +71,14 @@ void g_cclosure_marshal_VOID__CHARv (GClosure *closure,
GType *param_types);
/* VOID:UCHAR */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -88,14 +88,14 @@ void g_cclosure_marshal_VOID__UCHARv (GClosure *closure,
GType *param_types);
/* VOID:INT */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__INTv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -105,14 +105,14 @@ void g_cclosure_marshal_VOID__INTv (GClosure *closure,
GType *param_types);
/* VOID:UINT */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UINTv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -122,14 +122,14 @@ void g_cclosure_marshal_VOID__UINTv (GClosure *closure,
GType *param_types);
/* VOID:LONG */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__LONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__LONGv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -139,14 +139,14 @@ void g_cclosure_marshal_VOID__LONGv (GClosure *closure,
GType *param_types);
/* VOID:ULONG */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -156,14 +156,14 @@ void g_cclosure_marshal_VOID__ULONGv (GClosure *closure,
GType *param_types);
/* VOID:ENUM */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -173,14 +173,14 @@ void g_cclosure_marshal_VOID__ENUMv (GClosure *closure,
GType *param_types);
/* VOID:FLAGS */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -190,14 +190,14 @@ void g_cclosure_marshal_VOID__FLAGSv (GClosure *closure,
GType *param_types);
/* VOID:FLOAT */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -207,14 +207,14 @@ void g_cclosure_marshal_VOID__FLOATv (GClosure *closure,
GType *param_types);
/* VOID:DOUBLE */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -224,14 +224,14 @@ void g_cclosure_marshal_VOID__DOUBLEv (GClosure *closure,
GType *param_types);
/* VOID:STRING */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -241,14 +241,14 @@ void g_cclosure_marshal_VOID__STRINGv (GClosure *closure,
GType *param_types);
/* VOID:PARAM */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -258,14 +258,14 @@ void g_cclosure_marshal_VOID__PARAMv (GClosure *closure,
GType *param_types);
/* VOID:BOXED */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -275,14 +275,14 @@ void g_cclosure_marshal_VOID__BOXEDv (GClosure *closure,
GType *param_types);
/* VOID:POINTER */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -292,14 +292,14 @@ void g_cclosure_marshal_VOID__POINTERv (GClosure *closure,
GType *param_types);
/* VOID:OBJECT */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -309,14 +309,14 @@ void g_cclosure_marshal_VOID__OBJECTv (GClosure *closure,
GType *param_types);
/* VOID:VARIANT */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__VARIANT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -326,14 +326,14 @@ void g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
GType *param_types);
/* VOID:UINT,POINTER */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -343,14 +343,14 @@ void g_cclosure_marshal_VOID__UINT_POINTERv (GClosure *closure,
GType *param_types);
/* BOOL:FLAGS */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -378,14 +378,14 @@ void g_cclosure_marshal_BOOLEAN__FLAGSv (GClosure *closure,
#define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS
/* STRING:OBJECT,POINTER */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
GValue *return_value,
gpointer instance,
@@ -395,14 +395,14 @@ void g_cclosure_marshal_STRING__OBJECT_POINTERv (GClosure *closure,
GType *param_types);
/* BOOL:BOXED,BOXED */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_BOOLEAN__BOXED_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv (GClosure *closure,
GValue *return_value,
gpointer instance,
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 17bb0f59d3..ea0157c353 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -410,44 +410,44 @@ struct _GObjectConstructParam
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_initially_unowned_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_class_install_property (GObjectClass *oclass,
guint property_id,
GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_object_class_find_property (GObjectClass *oclass,
const gchar *property_name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec**g_object_class_list_properties (GObjectClass *oclass,
guint *n_properties);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_class_override_property (GObjectClass *oclass,
guint property_id,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_class_install_properties (GObjectClass *oclass,
guint n_pspecs,
GParamSpec **pspecs);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_interface_install_property (gpointer g_iface,
GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_object_interface_find_property (gpointer g_iface,
const gchar *property_name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec**g_object_interface_list_properties (gpointer g_iface,
guint *n_properties_p);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_object_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_new (GType object_type,
const gchar *first_property_name,
...);
-GLIB_AVAILABLE_IN_2_54
+GOBJECT_AVAILABLE_IN_2_54
GObject* g_object_new_with_properties (GType object_type,
guint n_properties,
const char *names[],
@@ -455,91 +455,91 @@ GObject* g_object_new_with_properties (GType object_type,
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties)
+GOBJECT_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties)
gpointer g_object_newv (GType object_type,
guint n_parameters,
GParameter *parameters);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GObject* g_object_new_valist (GType object_type,
const gchar *first_property_name,
va_list var_args);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_set (gpointer object,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_get (gpointer object,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_connect (gpointer object,
const gchar *signal_spec,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_disconnect (gpointer object,
const gchar *signal_spec,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_2_54
+GOBJECT_AVAILABLE_IN_2_54
void g_object_setv (GObject *object,
guint n_properties,
const gchar *names[],
const GValue values[]);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_set_valist (GObject *object,
const gchar *first_property_name,
va_list var_args);
-GLIB_AVAILABLE_IN_2_54
+GOBJECT_AVAILABLE_IN_2_54
void g_object_getv (GObject *object,
guint n_properties,
const gchar *names[],
GValue values[]);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_get_valist (GObject *object,
const gchar *first_property_name,
va_list var_args);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_set_property (GObject *object,
const gchar *property_name,
const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_get_property (GObject *object,
const gchar *property_name,
GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_freeze_notify (GObject *object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_notify (GObject *object,
const gchar *property_name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_notify_by_pspec (GObject *object,
GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_thaw_notify (GObject *object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_object_is_floating (gpointer object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_ref_sink (gpointer object);
-GLIB_AVAILABLE_IN_2_70
+GOBJECT_AVAILABLE_IN_2_70
gpointer g_object_take_ref (gpointer object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_ref (gpointer object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_unref (gpointer object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_weak_ref (GObject *object,
GWeakNotify notify,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_weak_unref (GObject *object,
GWeakNotify notify,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_add_weak_pointer (GObject *object,
gpointer *weak_pointer_location);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_remove_weak_pointer (GObject *object,
gpointer *weak_pointer_location);
@@ -567,37 +567,37 @@ typedef void (*GToggleNotify) (gpointer data,
GObject *object,
gboolean is_last_ref);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_add_toggle_ref (GObject *object,
GToggleNotify notify,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_remove_toggle_ref (GObject *object,
GToggleNotify notify,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_get_qdata (GObject *object,
GQuark quark);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_set_qdata (GObject *object,
GQuark quark,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_set_qdata_full (GObject *object,
GQuark quark,
gpointer data,
GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_steal_qdata (GObject *object,
GQuark quark);
-GLIB_AVAILABLE_IN_2_34
+GOBJECT_AVAILABLE_IN_2_34
gpointer g_object_dup_qdata (GObject *object,
GQuark quark,
GDuplicateFunc dup_func,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_34
+GOBJECT_AVAILABLE_IN_2_34
gboolean g_object_replace_qdata (GObject *object,
GQuark quark,
gpointer oldval,
@@ -605,28 +605,28 @@ gboolean g_object_replace_qdata (GObject *object,
GDestroyNotify destroy,
GDestroyNotify *old_destroy);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_get_data (GObject *object,
const gchar *key);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_set_data (GObject *object,
const gchar *key,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_set_data_full (GObject *object,
const gchar *key,
gpointer data,
GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_object_steal_data (GObject *object,
const gchar *key);
-GLIB_AVAILABLE_IN_2_34
+GOBJECT_AVAILABLE_IN_2_34
gpointer g_object_dup_data (GObject *object,
const gchar *key,
GDuplicateFunc dup_func,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_34
+GOBJECT_AVAILABLE_IN_2_34
gboolean g_object_replace_data (GObject *object,
const gchar *key,
gpointer oldval,
@@ -635,26 +635,26 @@ gboolean g_object_replace_data (GObject *object,
GDestroyNotify *old_destroy);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_watch_closure (GObject *object,
GClosure *closure);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_cclosure_new_object (GCallback callback_func,
GObject *object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_cclosure_new_object_swap (GCallback callback_func,
GObject *object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GClosure* g_closure_new_object (guint sizeof_closure,
GObject *object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_object (GValue *value,
gpointer v_object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_value_get_object (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_value_dup_object (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gulong g_signal_connect_object (gpointer instance,
const gchar *detailed_signal,
GCallback c_handler,
@@ -662,20 +662,20 @@ gulong g_signal_connect_object (gpointer instance,
GConnectFlags connect_flags);
/*< protected >*/
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_force_floating (GObject *object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_object_run_dispose (GObject *object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_take_object (GValue *value,
gpointer v_object);
-GLIB_DEPRECATED_FOR(g_value_take_object)
+GOBJECT_DEPRECATED_FOR(g_value_take_object)
void g_value_set_object_take_ownership (GValue *value,
gpointer v_object);
-GLIB_DEPRECATED
+GOBJECT_DEPRECATED
gsize g_object_compat_control (gsize what,
gpointer data);
@@ -705,7 +705,7 @@ G_STMT_START { \
#define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) \
G_OBJECT_WARN_INVALID_PSPEC ((object), "property", (property_id), (pspec))
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_clear_object (GObject **object_ptr);
#define g_clear_object(object_ptr) g_clear_pointer ((object_ptr), g_object_unref)
@@ -784,7 +784,7 @@ static inline gboolean
(void) (0 ? *(object_ptr) = (new_object), FALSE : FALSE); \
(g_set_object) (_object_ptr.out, (GObject *) new_object); \
})) \
- GLIB_AVAILABLE_MACRO_IN_2_44
+ GOBJECT_AVAILABLE_MACRO_IN_2_44
#else /* if !defined(__GNUC__) */
@@ -937,14 +937,14 @@ typedef struct {
union { gpointer p; } priv;
} GWeakRef;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_weak_ref_init (GWeakRef *weak_ref,
gpointer object);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_weak_ref_clear (GWeakRef *weak_ref);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_weak_ref_get (GWeakRef *weak_ref);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_weak_ref_set (GWeakRef *weak_ref,
gpointer object);
diff --git a/gobject/gparam.h b/gobject/gparam.h
index cf8e8dd8d2..6454e69a9d 100644
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -160,7 +160,7 @@ typedef enum
G_PARAM_CONSTRUCT_ONLY = 1 << 3,
G_PARAM_LAX_VALIDATION = 1 << 4,
G_PARAM_STATIC_NAME = 1 << 5,
- G_PARAM_PRIVATE GLIB_DEPRECATED_ENUMERATOR_IN_2_26 = G_PARAM_STATIC_NAME,
+ G_PARAM_PRIVATE GOBJECT_DEPRECATED_ENUMERATOR_IN_2_26 = G_PARAM_STATIC_NAME,
G_PARAM_STATIC_NICK = 1 << 6,
G_PARAM_STATIC_BLURB = 1 << 7,
/* User defined flags go here */
@@ -201,7 +201,7 @@ typedef enum
/* --- typedefs & structures --- */
typedef struct _GParamSpec GParamSpec;
typedef struct _GParamSpecClass GParamSpecClass;
-typedef struct _GParameter GParameter GLIB_DEPRECATED_TYPE_IN_2_54;
+typedef struct _GParameter GParameter GOBJECT_DEPRECATED_TYPE_IN_2_54;
typedef struct _GParamSpecPool GParamSpecPool;
/**
* GParamSpec: (ref-func g_param_spec_ref_sink) (unref-func g_param_spec_unref) (set-value-func
g_value_set_param) (get-value-func g_value_get_param)
@@ -289,82 +289,82 @@ struct _GParameter /* auxiliary structure for _setv() variants */
{
const gchar *name;
GValue value;
-} GLIB_DEPRECATED_TYPE_IN_2_54;
+} GOBJECT_DEPRECATED_TYPE_IN_2_54;
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_ref (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_param_spec_unref (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_param_spec_sink (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_ref_sink (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_param_spec_get_qdata (GParamSpec *pspec,
GQuark quark);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_param_spec_set_qdata (GParamSpec *pspec,
GQuark quark,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_param_spec_set_qdata_full (GParamSpec *pspec,
GQuark quark,
gpointer data,
GDestroyNotify destroy);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_param_spec_steal_qdata (GParamSpec *pspec,
GQuark quark);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_get_redirect_target (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_param_value_set_default (GParamSpec *pspec,
GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_param_value_defaults (GParamSpec *pspec,
const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_param_value_validate (GParamSpec *pspec,
GValue *value);
-GLIB_AVAILABLE_IN_2_74
+GOBJECT_AVAILABLE_IN_2_74
gboolean g_param_value_is_valid (GParamSpec *pspec,
const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_param_value_convert (GParamSpec *pspec,
const GValue *src_value,
GValue *dest_value,
gboolean strict_validation);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gint g_param_values_cmp (GParamSpec *pspec,
const GValue *value1,
const GValue *value2);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_param_spec_get_name (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_param_spec_get_nick (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_param_spec_get_blurb (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_param (GValue *value,
GParamSpec *param);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_value_get_param (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_value_dup_param (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_take_param (GValue *value,
GParamSpec *param);
-GLIB_DEPRECATED_FOR(g_value_take_param)
+GOBJECT_DEPRECATED_FOR(g_value_take_param)
void g_value_set_param_take_ownership (GValue *value,
GParamSpec *param);
-GLIB_AVAILABLE_IN_2_36
+GOBJECT_AVAILABLE_IN_2_36
const GValue * g_param_spec_get_default_value (GParamSpec *pspec);
-GLIB_AVAILABLE_IN_2_46
+GOBJECT_AVAILABLE_IN_2_46
GQuark g_param_spec_get_name_quark (GParamSpec *pspec);
/* --- convenience functions --- */
@@ -412,11 +412,11 @@ struct _GParamSpecTypeInfo
const GValue *value1,
const GValue *value2);
};
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_param_type_register_static (const gchar *name,
const GParamSpecTypeInfo *pspec_info);
-GLIB_AVAILABLE_IN_2_66
+GOBJECT_AVAILABLE_IN_2_66
gboolean g_param_spec_is_valid_name (const gchar *name);
/* For registering builting types */
@@ -426,30 +426,30 @@ GType _g_param_type_register_static_constant (const gchar *name,
/* --- protected --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_param_spec_internal (GType param_type,
const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpecPool* g_param_spec_pool_new (gboolean type_prefixing);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_param_spec_pool_insert (GParamSpecPool *pool,
GParamSpec *pspec,
GType owner_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_param_spec_pool_remove (GParamSpecPool *pool,
GParamSpec *pspec);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_pool_lookup (GParamSpecPool *pool,
const gchar *param_name,
GType owner_type,
gboolean walk_ancestors);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GList* g_param_spec_pool_list_owned (GParamSpecPool *pool,
GType owner_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec** g_param_spec_pool_list (GParamSpecPool *pool,
GType owner_type,
guint *n_pspecs_p);
diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index 0ef7f8fc88..eaabc10dca 100644
--- a/gobject/gparamspecs.h
+++ b/gobject/gparamspecs.h
@@ -454,7 +454,7 @@ G_BEGIN_DECLS
*
* Deprecated: 2.32: Use #GArray instead of #GValueArray
*/
-#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types[18]) GLIB_DEPRECATED_MACRO_IN_2_32
+#define G_TYPE_PARAM_VALUE_ARRAY (g_param_spec_types[18]) GOBJECT_DEPRECATED_MACRO_IN_2_32
/**
* G_IS_PARAM_SPEC_VALUE_ARRAY:
* @pspec: a valid #GParamSpec instance
@@ -465,7 +465,7 @@ G_BEGIN_DECLS
*
* Deprecated: 2.32: Use #GArray instead of #GValueArray
*/
-#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
GLIB_DEPRECATED_MACRO_IN_2_32
+#define G_IS_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM_VALUE_ARRAY))
GOBJECT_DEPRECATED_MACRO_IN_2_32
/**
* G_PARAM_SPEC_VALUE_ARRAY:
* @pspec: a valid #GParamSpec instance
@@ -474,7 +474,7 @@ G_BEGIN_DECLS
*
* Deprecated: 2.32: Use #GArray instead of #GValueArray
*/
-#define G_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY,
GParamSpecValueArray)) GLIB_DEPRECATED_MACRO_IN_2_32
+#define G_PARAM_SPEC_VALUE_ARRAY(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM_VALUE_ARRAY,
GParamSpecValueArray)) GOBJECT_DEPRECATED_MACRO_IN_2_32
/**
* G_TYPE_PARAM_OBJECT:
@@ -986,7 +986,7 @@ struct _GParamSpecVariant
};
/* --- GParamSpec prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_char (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -994,7 +994,7 @@ GParamSpec* g_param_spec_char (const gchar *name,
gint8 maximum,
gint8 default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_uchar (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1002,13 +1002,13 @@ GParamSpec* g_param_spec_uchar (const gchar *name,
guint8 maximum,
guint8 default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_boolean (const gchar *name,
const gchar *nick,
const gchar *blurb,
gboolean default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_int (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1016,7 +1016,7 @@ GParamSpec* g_param_spec_int (const gchar *name,
gint maximum,
gint default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_uint (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1024,7 +1024,7 @@ GParamSpec* g_param_spec_uint (const gchar *name,
guint maximum,
guint default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_long (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1032,7 +1032,7 @@ GParamSpec* g_param_spec_long (const gchar *name,
glong maximum,
glong default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_ulong (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1040,7 +1040,7 @@ GParamSpec* g_param_spec_ulong (const gchar *name,
gulong maximum,
gulong default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_int64 (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1048,7 +1048,7 @@ GParamSpec* g_param_spec_int64 (const gchar *name,
gint64 maximum,
gint64 default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_uint64 (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1056,27 +1056,27 @@ GParamSpec* g_param_spec_uint64 (const gchar *name,
guint64 maximum,
guint64 default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_unichar (const gchar *name,
const gchar *nick,
const gchar *blurb,
gunichar default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_enum (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType enum_type,
gint default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_flags (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType flags_type,
guint default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_float (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1084,7 +1084,7 @@ GParamSpec* g_param_spec_float (const gchar *name,
gfloat maximum,
gfloat default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_double (const gchar *name,
const gchar *nick,
const gchar *blurb,
@@ -1092,51 +1092,51 @@ GParamSpec* g_param_spec_double (const gchar *name,
gdouble maximum,
gdouble default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_string (const gchar *name,
const gchar *nick,
const gchar *blurb,
const gchar *default_value,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_param (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType param_type,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_boxed (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType boxed_type,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_pointer (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_value_array (const gchar *name,
const gchar *nick,
const gchar *blurb,
GParamSpec *element_spec,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_object (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType object_type,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_override (const gchar *name,
GParamSpec *overridden);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_gtype (const gchar *name,
const gchar *nick,
const gchar *blurb,
GType is_a_type,
GParamFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GParamSpec* g_param_spec_variant (const gchar *name,
const gchar *nick,
const gchar *blurb,
diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index 0d93f26714..f37e67a367 100644
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.h
@@ -169,7 +169,7 @@ typedef enum
*/
typedef enum
{
- G_CONNECT_DEFAULT GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
+ G_CONNECT_DEFAULT GOBJECT_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
G_CONNECT_AFTER = 1 << 0,
G_CONNECT_SWAPPED = 1 << 1
} GConnectFlags;
@@ -278,7 +278,7 @@ struct _GSignalQuery
/* --- signals --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_newv (const gchar *signal_name,
GType itype,
GSignalFlags signal_flags,
@@ -289,7 +289,7 @@ guint g_signal_newv (const gchar *signal_name,
GType return_type,
guint n_params,
GType *param_types);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_new_valist (const gchar *signal_name,
GType itype,
GSignalFlags signal_flags,
@@ -300,7 +300,7 @@ guint g_signal_new_valist (const gchar *signal_name,
GType return_type,
guint n_params,
va_list args);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_new (const gchar *signal_name,
GType itype,
GSignalFlags signal_flags,
@@ -311,7 +311,7 @@ guint g_signal_new (const gchar *signal_name,
GType return_type,
guint n_params,
...);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_new_class_handler (const gchar *signal_name,
GType itype,
GSignalFlags signal_flags,
@@ -322,109 +322,109 @@ guint g_signal_new_class_handler (const gchar *signal_name,
GType return_type,
guint n_params,
...);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_set_va_marshaller (guint signal_id,
GType instance_type,
GSignalCVaMarshaller va_marshaller);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_emitv (const GValue *instance_and_params,
guint signal_id,
GQuark detail,
GValue *return_value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_emit_valist (gpointer instance,
guint signal_id,
GQuark detail,
va_list var_args);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_emit (gpointer instance,
guint signal_id,
GQuark detail,
...);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_emit_by_name (gpointer instance,
const gchar *detailed_signal,
...);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_lookup (const gchar *name,
GType itype);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_signal_name (guint signal_id);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_query (guint signal_id,
GSignalQuery *query);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint* g_signal_list_ids (GType itype,
guint *n_ids);
-GLIB_AVAILABLE_IN_2_66
+GOBJECT_AVAILABLE_IN_2_66
gboolean g_signal_is_valid_name (const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_signal_parse_name (const gchar *detailed_signal,
GType itype,
guint *signal_id_p,
GQuark *detail_p,
gboolean force_detail_quark);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GSignalInvocationHint* g_signal_get_invocation_hint (gpointer instance);
/* --- signal emissions --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_stop_emission (gpointer instance,
guint signal_id,
GQuark detail);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_stop_emission_by_name (gpointer instance,
const gchar *detailed_signal);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gulong g_signal_add_emission_hook (guint signal_id,
GQuark detail,
GSignalEmissionHook hook_func,
gpointer hook_data,
GDestroyNotify data_destroy);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_remove_emission_hook (guint signal_id,
gulong hook_id);
/* --- signal handlers --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_signal_has_handler_pending (gpointer instance,
guint signal_id,
GQuark detail,
gboolean may_be_blocked);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gulong g_signal_connect_closure_by_id (gpointer instance,
guint signal_id,
GQuark detail,
GClosure *closure,
gboolean after);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gulong g_signal_connect_closure (gpointer instance,
const gchar *detailed_signal,
GClosure *closure,
gboolean after);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gulong g_signal_connect_data (gpointer instance,
const gchar *detailed_signal,
GCallback c_handler,
gpointer data,
GClosureNotify destroy_data,
GConnectFlags connect_flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_handler_block (gpointer instance,
gulong handler_id);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_handler_unblock (gpointer instance,
gulong handler_id);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_handler_disconnect (gpointer instance,
gulong handler_id);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_signal_handler_is_connected (gpointer instance,
gulong handler_id);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gulong g_signal_handler_find (gpointer instance,
GSignalMatchType mask,
guint signal_id,
@@ -432,7 +432,7 @@ gulong g_signal_handler_find (gpointer instance,
GClosure *closure,
gpointer func,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_handlers_block_matched (gpointer instance,
GSignalMatchType mask,
guint signal_id,
@@ -440,7 +440,7 @@ guint g_signal_handlers_block_matched (gpointer instance,
GClosure *closure,
gpointer func,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_handlers_unblock_matched (gpointer instance,
GSignalMatchType mask,
guint signal_id,
@@ -448,7 +448,7 @@ guint g_signal_handlers_unblock_matched (gpointer instance,
GClosure *closure,
gpointer func,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_signal_handlers_disconnect_matched (gpointer instance,
GSignalMatchType mask,
guint signal_id,
@@ -457,7 +457,7 @@ guint g_signal_handlers_disconnect_matched (gpointer instance,
gpointer func,
gpointer data);
-GLIB_AVAILABLE_IN_2_62
+GOBJECT_AVAILABLE_IN_2_62
void g_clear_signal_handler (gulong *handler_id_ptr,
gpointer instance);
@@ -473,21 +473,21 @@ void g_clear_signal_handler (gulong *handler_id_ptr,
g_signal_handler_disconnect (_instance, _handler_id); \
} \
} G_STMT_END \
- GLIB_AVAILABLE_MACRO_IN_2_62
+ GOBJECT_AVAILABLE_MACRO_IN_2_62
/* --- overriding and chaining --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_override_class_closure (guint signal_id,
GType instance_type,
GClosure *class_closure);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_override_class_handler (const gchar *signal_name,
GType instance_type,
GCallback class_handler);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_chain_from_overridden (const GValue *instance_and_params,
GValue *return_value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_chain_from_overridden_handler (gpointer instance,
...);
@@ -625,20 +625,20 @@ void g_signal_chain_from_overridden_handler (gpointer instance,
0, 0, NULL, (func), (data))
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_signal_accumulator_true_handled (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_signal_accumulator_first_wins (GSignalInvocationHint *ihint,
GValue *return_accu,
const GValue *handler_return,
gpointer dummy);
/*< private >*/
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_signal_handlers_destroy (gpointer instance);
void _g_signals_destroy (GType itype);
diff --git a/gobject/gsignalgroup.h b/gobject/gsignalgroup.h
index ec93bdd619..6aa151ca4d 100644
--- a/gobject/gsignalgroup.h
+++ b/gobject/gsignalgroup.h
@@ -46,48 +46,48 @@ G_BEGIN_DECLS
*/
typedef struct _GSignalGroup GSignalGroup;
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
GType g_signal_group_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
GSignalGroup *g_signal_group_new (GType target_type);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_set_target (GSignalGroup *self,
gpointer target);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
gpointer g_signal_group_dup_target (GSignalGroup *self);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_block (GSignalGroup *self);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_unblock (GSignalGroup *self);
-GLIB_AVAILABLE_IN_2_74
+GOBJECT_AVAILABLE_IN_2_74
void g_signal_group_connect_closure (GSignalGroup *self,
const gchar *detailed_signal,
GClosure *closure,
gboolean after);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_connect_object (GSignalGroup *self,
const gchar *detailed_signal,
GCallback c_handler,
gpointer object,
GConnectFlags flags);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_connect_data (GSignalGroup *self,
const gchar *detailed_signal,
GCallback c_handler,
gpointer data,
GClosureNotify notify,
GConnectFlags flags);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_connect (GSignalGroup *self,
const gchar *detailed_signal,
GCallback c_handler,
gpointer data);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_connect_after (GSignalGroup *self,
const gchar *detailed_signal,
GCallback c_handler,
gpointer data);
-GLIB_AVAILABLE_IN_2_72
+GOBJECT_AVAILABLE_IN_2_72
void g_signal_group_connect_swapped (GSignalGroup *self,
const gchar *detailed_signal,
GCallback c_handler,
diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h
index 9a14252505..d60916542e 100644
--- a/gobject/gsourceclosure.h
+++ b/gobject/gsourceclosure.h
@@ -28,11 +28,11 @@
G_BEGIN_DECLS
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_source_set_closure (GSource *source,
GClosure *closure);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_source_set_dummy_callback (GSource *source);
G_END_DECLS
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 5e28498ceb..6348833a27 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -388,7 +388,7 @@ G_BEGIN_DECLS
*
* Since: 2.70
*/
-#define G_TYPE_IS_FINAL(type) (g_type_test_flags ((type), G_TYPE_FLAG_FINAL))
GLIB_AVAILABLE_MACRO_IN_2_70
+#define G_TYPE_IS_FINAL(type) (g_type_test_flags ((type), G_TYPE_FLAG_FINAL))
GOBJECT_AVAILABLE_MACRO_IN_2_70
/* Typedefs
@@ -661,7 +661,7 @@ struct _GTypeQuery
* `your_type_get_instance_private()` function instead
* Returns: (not nullable): a pointer to the private data structure
*/
-#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type) ((c_type*) g_type_instance_get_private
((GTypeInstance*) (instance), (g_type))) GLIB_DEPRECATED_MACRO_IN_2_58_FOR(G_ADD_PRIVATE)
+#define G_TYPE_INSTANCE_GET_PRIVATE(instance, g_type, c_type) ((c_type*) g_type_instance_get_private
((GTypeInstance*) (instance), (g_type))) GOBJECT_DEPRECATED_MACRO_IN_2_58_FOR(G_ADD_PRIVATE)
/**
* G_TYPE_CLASS_GET_PRIVATE:
@@ -704,81 +704,81 @@ typedef enum /*< skip >*/
G_TYPE_DEBUG_SIGNALS = 1 << 1,
G_TYPE_DEBUG_INSTANCE_COUNT = 1 << 2,
G_TYPE_DEBUG_MASK = 0x07
-} GTypeDebugFlags GLIB_DEPRECATED_TYPE_IN_2_36;
+} GTypeDebugFlags GOBJECT_DEPRECATED_TYPE_IN_2_36;
/* --- prototypes --- */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_DEPRECATED_IN_2_36
+GOBJECT_DEPRECATED_IN_2_36
void g_type_init (void);
-GLIB_DEPRECATED_IN_2_36
+GOBJECT_DEPRECATED_IN_2_36
void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags);
G_GNUC_END_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_type_name (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GQuark g_type_qname (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_from_name (const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_parent (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_type_depth (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_next_base (GType leaf_type,
GType root_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_is_a (GType type,
GType is_a_type);
/* Hoist exact GType comparisons into the caller */
#define g_type_is_a(a,b) ((a) == (b) || (g_type_is_a) ((a), (b)))
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_class_ref (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_class_peek (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_class_peek_static (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_class_unref (gpointer g_class);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_class_peek_parent (gpointer g_class);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_interface_peek (gpointer instance_class,
GType iface_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_interface_peek_parent (gpointer g_iface);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_default_interface_ref (GType g_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_default_interface_peek (GType g_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_default_interface_unref (gpointer g_iface);
/* g_free() the returned arrays */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType* g_type_children (GType type,
guint *n_children);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType* g_type_interfaces (GType type,
guint *n_interfaces);
/* per-type _static_ data */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_set_qdata (GType type,
GQuark quark,
gpointer data);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_get_qdata (GType type,
GQuark quark);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_query (GType type,
GTypeQuery *query);
-GLIB_AVAILABLE_IN_2_44
+GOBJECT_AVAILABLE_IN_2_44
int g_type_get_instance_count (GType type);
/* --- type registration --- */
@@ -1055,10 +1055,10 @@ typedef enum /*< skip >*/
*/
typedef enum /*< skip >*/
{
- G_TYPE_FLAG_NONE GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
+ G_TYPE_FLAG_NONE GOBJECT_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
G_TYPE_FLAG_ABSTRACT = (1 << 4),
G_TYPE_FLAG_VALUE_ABSTRACT = (1 << 5),
- G_TYPE_FLAG_FINAL GLIB_AVAILABLE_ENUMERATOR_IN_2_70 = (1 << 6)
+ G_TYPE_FLAG_FINAL GOBJECT_AVAILABLE_ENUMERATOR_IN_2_70 = (1 << 6)
} GTypeFlags;
/**
* GTypeInfo:
@@ -1311,12 +1311,12 @@ struct _GTypeValueTable
GTypeCValue *collect_values,
guint collect_flags);
};
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_register_static (GType parent_type,
const gchar *type_name,
const GTypeInfo *info,
GTypeFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_register_static_simple (GType parent_type,
const gchar *type_name,
guint class_size,
@@ -1325,59 +1325,59 @@ GType g_type_register_static_simple (GType parent_type
GInstanceInitFunc instance_init,
GTypeFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_register_dynamic (GType parent_type,
const gchar *type_name,
GTypePlugin *plugin,
GTypeFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_register_fundamental (GType type_id,
const gchar *type_name,
const GTypeInfo *info,
const GTypeFundamentalInfo *finfo,
GTypeFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_add_interface_static (GType instance_type,
GType interface_type,
const GInterfaceInfo *info);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_add_interface_dynamic (GType instance_type,
GType interface_type,
GTypePlugin *plugin);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_interface_add_prerequisite (GType interface_type,
GType prerequisite_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType*g_type_interface_prerequisites (GType interface_type,
guint *n_prerequisites);
-GLIB_AVAILABLE_IN_2_68
+GOBJECT_AVAILABLE_IN_2_68
GType g_type_interface_instantiatable_prerequisite
(GType interface_type);
-GLIB_DEPRECATED_IN_2_58
+GOBJECT_DEPRECATED_IN_2_58
void g_type_class_add_private (gpointer g_class,
gsize private_size);
-GLIB_AVAILABLE_IN_2_38
+GOBJECT_AVAILABLE_IN_2_38
gint g_type_add_instance_private (GType class_type,
gsize private_size);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_instance_get_private (GTypeInstance *instance,
GType private_type);
-GLIB_AVAILABLE_IN_2_38
+GOBJECT_AVAILABLE_IN_2_38
void g_type_class_adjust_private_offset (gpointer g_class,
gint *private_size_or_offset);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_add_class_private (GType class_type,
gsize private_size);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_type_class_get_private (GTypeClass *klass,
GType private_type);
-GLIB_AVAILABLE_IN_2_38
+GOBJECT_AVAILABLE_IN_2_38
gint g_type_class_get_instance_private_offset (gpointer g_class);
-GLIB_AVAILABLE_IN_2_34
+GOBJECT_AVAILABLE_IN_2_34
void g_type_ensure (GType type);
-GLIB_AVAILABLE_IN_2_36
+GOBJECT_AVAILABLE_IN_2_36
guint g_type_get_type_registration_serial (void);
@@ -1791,7 +1791,7 @@ guint g_type_get_type_registration_serial (void);
*
* Since: 2.70
*/
-#define G_DEFINE_FINAL_TYPE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P,
G_TYPE_FLAG_FINAL, {}) GLIB_AVAILABLE_MACRO_IN_2_70
+#define G_DEFINE_FINAL_TYPE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P,
G_TYPE_FLAG_FINAL, {}) GOBJECT_AVAILABLE_MACRO_IN_2_70
/**
* G_DEFINE_FINAL_TYPE_WITH_CODE:
* @TN: the name of the new type, in Camel case
@@ -1810,7 +1810,7 @@ guint g_type_get_type_registration_serial (void);
*
* Since: 2.70
*/
-#define G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P,
G_TYPE_FLAG_FINAL) {_C_;} _G_DEFINE_TYPE_EXTENDED_END() GLIB_AVAILABLE_MACRO_IN_2_70
+#define G_DEFINE_FINAL_TYPE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P,
G_TYPE_FLAG_FINAL) {_C_;} _G_DEFINE_TYPE_EXTENDED_END() GOBJECT_AVAILABLE_MACRO_IN_2_70
/**
* G_DEFINE_FINAL_TYPE_WITH_PRIVATE:
* @TN: the name of the new type, in Camel case
@@ -1826,7 +1826,7 @@ guint g_type_get_type_registration_serial (void);
*
* Since: 2.70
*/
-#define G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P,
G_TYPE_FLAG_FINAL, G_ADD_PRIVATE (TN)) GLIB_AVAILABLE_MACRO_IN_2_70
+#define G_DEFINE_FINAL_TYPE_WITH_PRIVATE(TN, t_n, T_P) G_DEFINE_TYPE_EXTENDED (TN, t_n, T_P,
G_TYPE_FLAG_FINAL, G_ADD_PRIVATE (TN)) GOBJECT_AVAILABLE_MACRO_IN_2_70
/**
* G_DEFINE_TYPE_EXTENDED:
* @TN: The name of the new type, in Camel case.
@@ -2429,74 +2429,74 @@ type_name##_get_type_once (void) \
{ /* custom code follows */
/* --- protected (for fundamental type implementations) --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GTypePlugin* g_type_get_plugin (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GTypePlugin* g_type_interface_get_plugin (GType instance_type,
GType interface_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_fundamental_next (void);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_fundamental (GType type_id);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GTypeInstance* g_type_create_instance (GType type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_free_instance (GTypeInstance *instance);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_add_class_cache_func (gpointer cache_data,
GTypeClassCacheFunc cache_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_remove_class_cache_func (gpointer cache_data,
GTypeClassCacheFunc cache_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_class_unref_uncached (gpointer g_class);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_add_interface_check (gpointer check_data,
GTypeInterfaceCheckFunc check_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_remove_interface_check (gpointer check_data,
GTypeInterfaceCheckFunc check_func);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GTypeValueTable* g_type_value_table_peek (GType type);
/*< private >*/
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_check_instance (GTypeInstance *instance) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GTypeInstance* g_type_check_instance_cast (GTypeInstance *instance,
GType iface_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_check_instance_is_a (GTypeInstance *instance,
GType iface_type) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_2_42
+GOBJECT_AVAILABLE_IN_2_42
gboolean g_type_check_instance_is_fundamentally_a (GTypeInstance *instance,
GType fundamental_type) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GTypeClass* g_type_check_class_cast (GTypeClass *g_class,
GType is_a_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_check_class_is_a (GTypeClass *g_class,
GType is_a_type) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_check_is_value_type (GType type) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_check_value (const GValue *value) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_check_value_holds (const GValue *value,
GType type) G_GNUC_PURE;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_test_flags (GType type,
guint flags) G_GNUC_CONST;
/* --- debugging functions --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_type_name_from_instance (GTypeInstance *instance);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_type_name_from_class (GTypeClass *g_class);
diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index 881a6f66ef..e386b50dff 100644
--- a/gobject/gtypemodule.h
+++ b/gobject/gtypemodule.h
@@ -268,31 +268,31 @@ type_name##_register_type (GTypeModule *type_module) \
TypeName##_private_offset = sizeof (TypeName##Private); \
}
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_module_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_type_module_use (GTypeModule *module);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_module_unuse (GTypeModule *module);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_module_set_name (GTypeModule *module,
const gchar *name);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_module_register_type (GTypeModule *module,
GType parent_type,
const gchar *type_name,
const GTypeInfo *type_info,
GTypeFlags flags);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_module_add_interface (GTypeModule *module,
GType instance_type,
GType interface_type,
const GInterfaceInfo *interface_info);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_module_register_enum (GTypeModule *module,
const gchar *name,
const GEnumValue *const_static_values);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_module_register_flags (GTypeModule *module,
const gchar *name,
const GFlagsValue *const_static_values);
diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h
index 92a72421fd..3711932be1 100644
--- a/gobject/gtypeplugin.h
+++ b/gobject/gtypeplugin.h
@@ -114,18 +114,18 @@ struct _GTypePluginClass
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_type_plugin_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_plugin_use (GTypePlugin *plugin);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_plugin_unuse (GTypePlugin *plugin);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_plugin_complete_type_info (GTypePlugin *plugin,
GType g_type,
GTypeInfo *info,
GTypeValueTable *value_table);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_type_plugin_complete_interface_info (GTypePlugin *plugin,
GType instance_type,
GType interface_type,
diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index d7adca2f50..2ac5ca1893 100644
--- a/gobject/gvalue.h
+++ b/gobject/gvalue.h
@@ -131,42 +131,42 @@ struct _GValue
/* --- prototypes --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GValue* g_value_init (GValue *value,
GType g_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_copy (const GValue *src_value,
GValue *dest_value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GValue* g_value_reset (GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_unset (GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_instance (GValue *value,
gpointer instance);
-GLIB_AVAILABLE_IN_2_42
+GOBJECT_AVAILABLE_IN_2_42
void g_value_init_from_instance (GValue *value,
gpointer instance);
/* --- private --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_value_fits_pointer (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_value_peek_pointer (const GValue *value);
/* --- implementation details --- */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_value_type_compatible (GType src_type,
GType dest_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_value_type_transformable (GType src_type,
GType dest_type);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_value_transform (const GValue *src_value,
GValue *dest_value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_register_transform_func (GType src_type,
GType dest_type,
GValueTransform transform_func);
@@ -189,7 +189,7 @@ void g_value_register_transform_func (GType src_type,
*
* Since: 2.66
*/
-#define G_VALUE_INTERNED_STRING (1 << 28) GLIB_AVAILABLE_MACRO_IN_2_66
+#define G_VALUE_INTERNED_STRING (1 << 28) GOBJECT_AVAILABLE_MACRO_IN_2_66
/**
* G_VALUE_INIT:
diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index 465565816e..72aa91b57e 100644
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -37,7 +37,7 @@ G_BEGIN_DECLS
*
* Deprecated: 2.32: Use #GArray instead of #GValueArray
*/
-#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ()) GLIB_DEPRECATED_MACRO_IN_2_32_FOR(G_TYPE_ARRAY)
+#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ()) GOBJECT_DEPRECATED_MACRO_IN_2_32_FOR(G_TYPE_ARRAY)
/* --- typedefs & structs --- */
typedef struct _GValueArray GValueArray;
@@ -58,44 +58,44 @@ struct _GValueArray
};
/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GType g_value_array_get_type (void) G_GNUC_CONST;
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValue* g_value_array_get_nth (GValueArray *value_array,
guint index_);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_new (guint n_prealloced);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
void g_value_array_free (GValueArray *value_array);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_copy (const GValueArray *value_array);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_prepend (GValueArray *value_array,
const GValue *value);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_append (GValueArray *value_array,
const GValue *value);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_insert (GValueArray *value_array,
guint index_,
const GValue *value);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_remove (GValueArray *value_array,
guint index_);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_sort (GValueArray *value_array,
GCompareFunc compare_func);
-GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GOBJECT_DEPRECATED_IN_2_32_FOR(GArray)
GValueArray* g_value_array_sort_with_data (GValueArray *value_array,
GCompareDataFunc compare_func,
gpointer user_data);
diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h
index 9aa6ba9cdb..0c8d0f66e0 100644
--- a/gobject/gvaluetypes.h
+++ b/gobject/gvaluetypes.h
@@ -150,7 +150,7 @@ G_BEGIN_DECLS
*
* Since: 2.66
*/
-#define G_VALUE_IS_INTERNED_STRING(value) (G_VALUE_HOLDS_STRING (value) && ((value)->data[1].v_uint &
G_VALUE_INTERNED_STRING)) GLIB_AVAILABLE_MACRO_IN_2_66
+#define G_VALUE_IS_INTERNED_STRING(value) (G_VALUE_HOLDS_STRING (value) && ((value)->data[1].v_uint &
G_VALUE_INTERNED_STRING)) GOBJECT_AVAILABLE_MACRO_IN_2_66
/**
* G_VALUE_HOLDS_POINTER:
* @value: a valid #GValue structure
@@ -190,116 +190,116 @@ G_BEGIN_DECLS
/* --- prototypes --- */
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_set_schar)
+GOBJECT_DEPRECATED_IN_2_32_FOR(g_value_set_schar)
void g_value_set_char (GValue *value,
gchar v_char);
-GLIB_DEPRECATED_IN_2_32_FOR(g_value_get_schar)
+GOBJECT_DEPRECATED_IN_2_32_FOR(g_value_get_schar)
gchar g_value_get_char (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_schar (GValue *value,
gint8 v_char);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gint8 g_value_get_schar (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_uchar (GValue *value,
guchar v_uchar);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guchar g_value_get_uchar (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_boolean (GValue *value,
gboolean v_boolean);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gboolean g_value_get_boolean (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_int (GValue *value,
gint v_int);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gint g_value_get_int (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_uint (GValue *value,
guint v_uint);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint g_value_get_uint (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_long (GValue *value,
glong v_long);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
glong g_value_get_long (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_ulong (GValue *value,
gulong v_ulong);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gulong g_value_get_ulong (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_int64 (GValue *value,
gint64 v_int64);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gint64 g_value_get_int64 (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_uint64 (GValue *value,
guint64 v_uint64);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
guint64 g_value_get_uint64 (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_float (GValue *value,
gfloat v_float);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gfloat g_value_get_float (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_double (GValue *value,
gdouble v_double);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gdouble g_value_get_double (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_string (GValue *value,
const gchar *v_string);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_static_string (GValue *value,
const gchar *v_string);
-GLIB_AVAILABLE_IN_2_66
+GOBJECT_AVAILABLE_IN_2_66
void g_value_set_interned_string (GValue *value,
const gchar *v_string);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
const gchar * g_value_get_string (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gchar* g_value_dup_string (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_pointer (GValue *value,
gpointer v_pointer);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gpointer g_value_get_pointer (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_gtype_get_type (void);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_gtype (GValue *value,
GType v_gtype);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_value_get_gtype (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_set_variant (GValue *value,
GVariant *variant);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_take_variant (GValue *value,
GVariant *variant);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GVariant* g_value_get_variant (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GVariant* g_value_dup_variant (const GValue *value);
/* Convenience for registering new pointer types */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
GType g_pointer_type_register_static (const gchar *name);
/* debugging aid, describe value contents as string */
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
gchar* g_strdup_value_contents (const GValue *value);
-GLIB_AVAILABLE_IN_ALL
+GOBJECT_AVAILABLE_IN_ALL
void g_value_take_string (GValue *value,
gchar *v_string);
-GLIB_DEPRECATED_FOR(g_value_take_string)
+GOBJECT_DEPRECATED_FOR(g_value_take_string)
void g_value_set_string_take_ownership (GValue *value,
gchar *v_string);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
