From 1cc7162c9560796829db457f7ea5fdd218a0ae46 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 25 May 2012 08:59:09 -0400 Subject: [PATCH] Annotate API introduced for 2.32 with GLIB_AVAILABLE_IN_2_32 https://bugzilla.gnome.org/show_bug.cgi?id=676816 --- gio/gactiongroup.h | 1 + gio/gactiongroupexporter.h | 2 ++ gio/gactionmap.h | 3 +-- gio/gappinfo.h | 3 +++ gio/gapplication.h | 2 ++ gio/gdbusactiongroup.h | 1 + gio/gdbusinterface.h | 1 + gio/gdrive.h | 1 + gio/gfile.h | 1 + gio/gfileinfo.h | 1 + gio/ginetaddressmask.h | 3 +++ gio/ginetsocketaddress.h | 2 ++ gio/gmenu.h | 2 ++ gio/gmenuexporter.h | 2 ++ gio/gnetworkmonitor.h | 2 ++ gio/gnetworkmonitorbase.h | 2 ++ gio/gremoteactiongroup.h | 3 +++ gio/gresource.h | 17 +++++++++++++++++ gio/gsettings.h | 2 ++ gio/gsettingsschema.h | 7 +++++++ gio/gsimpleasyncresult.h | 1 + gio/gsocket.h | 11 +++++++++++ gio/gsocketconnection.h | 4 ++++ gio/gunixconnection.h | 4 ++++ gio/gunixmounts.h | 1 + gio/gvolume.h | 1 + 26 files changed, 78 insertions(+), 2 deletions(-) diff --git a/gio/gactiongroup.h b/gio/gactiongroup.h index b52006b..b300aef 100644 --- a/gio/gactiongroup.h +++ b/gio/gactiongroup.h @@ -135,6 +135,7 @@ void g_action_group_action_state_changed (GAction const gchar *action_name, GVariant *state); +GLIB_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 2ff4d0b..eaa18e6 100644 --- a/gio/gactiongroupexporter.h +++ b/gio/gactiongroupexporter.h @@ -32,11 +32,13 @@ G_BEGIN_DECLS +GLIB_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 void g_dbus_connection_unexport_action_group (GDBusConnection *connection, guint export_id); diff --git a/gio/gactionmap.h b/gio/gactionmap.h index 98bc6ef..8e5993e 100644 --- a/gio/gactionmap.h +++ b/gio/gactionmap.h @@ -74,8 +74,7 @@ struct _GActionEntry gsize padding[3]; }; - - +GLIB_AVAILABLE_IN_2_32 GType g_action_map_get_type (void) G_GNUC_CONST; GAction * g_action_map_lookup_action (GActionMap *action_map, diff --git a/gio/gappinfo.h b/gio/gappinfo.h index 17d2f76..578f62f 100644 --- a/gio/gappinfo.h +++ b/gio/gappinfo.h @@ -238,11 +238,14 @@ struct _GAppLaunchContextClass GType g_app_launch_context_get_type (void) G_GNUC_CONST; GAppLaunchContext *g_app_launch_context_new (void); +GLIB_AVAILABLE_IN_2_32 void g_app_launch_context_setenv (GAppLaunchContext *context, const char *variable, const char *value); +GLIB_AVAILABLE_IN_2_32 void g_app_launch_context_unsetenv (GAppLaunchContext *context, const char *variable); +GLIB_AVAILABLE_IN_2_32 char ** g_app_launch_context_get_environment (GAppLaunchContext *context); char * g_app_launch_context_get_display (GAppLaunchContext *context, diff --git a/gio/gapplication.h b/gio/gapplication.h index c0cad11..f5d912f 100644 --- a/gio/gapplication.h +++ b/gio/gapplication.h @@ -145,7 +145,9 @@ int g_application_run (GApplic void g_application_quit (GApplication *application); +GLIB_AVAILABLE_IN_2_32 GApplication * g_application_get_default (void); +GLIB_AVAILABLE_IN_2_32 void g_application_set_default (GApplication *application); G_END_DECLS diff --git a/gio/gdbusactiongroup.h b/gio/gdbusactiongroup.h index 12a8edf..12a2f60 100644 --- a/gio/gdbusactiongroup.h +++ b/gio/gdbusactiongroup.h @@ -45,6 +45,7 @@ G_BEGIN_DECLS GType g_dbus_action_group_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 GDBusActionGroup * g_dbus_action_group_get (GDBusConnection *connection, const gchar *bus_name, const gchar *object_path); diff --git a/gio/gdbusinterface.h b/gio/gdbusinterface.h index bce7587..9536e62 100644 --- a/gio/gdbusinterface.h +++ b/gio/gdbusinterface.h @@ -71,6 +71,7 @@ GDBusInterfaceInfo *g_dbus_interface_get_info (GDBusInterface *in GDBusObject *g_dbus_interface_get_object (GDBusInterface *interface_); void g_dbus_interface_set_object (GDBusInterface *interface_, GDBusObject *object); +GLIB_AVAILABLE_IN_2_32 GDBusObject *g_dbus_interface_dup_object (GDBusInterface *interface_); G_END_DECLS diff --git a/gio/gdrive.h b/gio/gdrive.h index cb64e73..25ed4f4 100644 --- a/gio/gdrive.h +++ b/gio/gdrive.h @@ -224,6 +224,7 @@ gboolean g_drive_eject_with_operation_finish (GDrive *drive, GAsyncResult *result, GError **error); +GLIB_AVAILABLE_IN_2_32 const gchar *g_drive_get_sort_key (GDrive *drive); G_END_DECLS diff --git a/gio/gfile.h b/gio/gfile.h index ea156d1..f784c5d 100644 --- a/gio/gfile.h +++ b/gio/gfile.h @@ -550,6 +550,7 @@ GType g_file_get_type (void) G_GNUC_CONST; GFile * g_file_new_for_path (const char *path); GFile * g_file_new_for_uri (const char *uri); GFile * g_file_new_for_commandline_arg (const char *arg); +GLIB_AVAILABLE_IN_2_32 GFile * g_file_new_tmp (const char *tmpl, GFileIOStream **iostream, GError **error); diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h index 3cc46d6..3c3e18f 100644 --- a/gio/gfileinfo.h +++ b/gio/gfileinfo.h @@ -959,6 +959,7 @@ gboolean g_file_attribute_matcher_matches_only (GFileAttributeMa gboolean g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher, const char *ns); const char * g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher); +GLIB_AVAILABLE_IN_2_32 char * g_file_attribute_matcher_to_string (GFileAttributeMatcher *matcher); G_END_DECLS diff --git a/gio/ginetaddressmask.h b/gio/ginetaddressmask.h index 17d00ca..53b0aac 100644 --- a/gio/ginetaddressmask.h +++ b/gio/ginetaddressmask.h @@ -53,12 +53,15 @@ struct _GInetAddressMaskClass }; +GLIB_AVAILABLE_IN_2_32 GType g_inet_address_mask_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 GInetAddressMask *g_inet_address_mask_new (GInetAddress *addr, guint length, GError **error); +GLIB_AVAILABLE_IN_2_32 GInetAddressMask *g_inet_address_mask_new_from_string (const gchar *mask_string, GError **error); gchar *g_inet_address_mask_to_string (GInetAddressMask *mask); diff --git a/gio/ginetsocketaddress.h b/gio/ginetsocketaddress.h index 94caec8..ab20235 100644 --- a/gio/ginetsocketaddress.h +++ b/gio/ginetsocketaddress.h @@ -63,7 +63,9 @@ GSocketAddress *g_inet_socket_address_new (GInetAddress *address, GInetAddress * g_inet_socket_address_get_address (GInetSocketAddress *address); guint16 g_inet_socket_address_get_port (GInetSocketAddress *address); +GLIB_AVAILABLE_IN_2_32 guint32 g_inet_socket_address_get_flowinfo (GInetSocketAddress *address); +GLIB_AVAILABLE_IN_2_32 guint32 g_inet_socket_address_get_scope_id (GInetSocketAddress *address); G_END_DECLS diff --git a/gio/gmenu.h b/gio/gmenu.h index fc3a04b..b7eafd1 100644 --- a/gio/gmenu.h +++ b/gio/gmenu.h @@ -41,7 +41,9 @@ G_BEGIN_DECLS typedef struct _GMenuItem GMenuItem; typedef struct _GMenu GMenu; +GLIB_AVAILABLE_IN_2_32 GType g_menu_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 GMenu * g_menu_new (void); void g_menu_freeze (GMenu *menu); diff --git a/gio/gmenuexporter.h b/gio/gmenuexporter.h index b555c4f..1673b22 100644 --- a/gio/gmenuexporter.h +++ b/gio/gmenuexporter.h @@ -27,11 +27,13 @@ G_BEGIN_DECLS +GLIB_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 void g_dbus_connection_unexport_menu_model (GDBusConnection *connection, guint export_id); diff --git a/gio/gnetworkmonitor.h b/gio/gnetworkmonitor.h index e525293..995ff54 100644 --- a/gio/gnetworkmonitor.h +++ b/gio/gnetworkmonitor.h @@ -66,7 +66,9 @@ struct _GNetworkMonitorInterface { GError **error); }; +GLIB_AVAILABLE_IN_2_32 GType g_network_monitor_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 GNetworkMonitor *g_network_monitor_get_default (void); gboolean g_network_monitor_get_network_available (GNetworkMonitor *monitor); diff --git a/gio/gnetworkmonitorbase.h b/gio/gnetworkmonitorbase.h index 47ef336..f70403f 100644 --- a/gio/gnetworkmonitorbase.h +++ b/gio/gnetworkmonitorbase.h @@ -53,8 +53,10 @@ struct _GNetworkMonitorBaseClass { GType g_network_monitor_base_get_type (void); /*< protected >*/ +GLIB_AVAILABLE_IN_2_32 void g_network_monitor_base_add_network (GNetworkMonitorBase *monitor, GInetAddressMask *network); +GLIB_AVAILABLE_IN_2_32 void g_network_monitor_base_remove_network (GNetworkMonitorBase *monitor, GInetAddressMask *network); void g_network_monitor_base_set_networks (GNetworkMonitorBase *monitor, diff --git a/gio/gremoteactiongroup.h b/gio/gremoteactiongroup.h index 1bf10f0..d2849e6 100644 --- a/gio/gremoteactiongroup.h +++ b/gio/gremoteactiongroup.h @@ -57,13 +57,16 @@ struct _GRemoteActionGroupInterface GVariant *platform_data); }; +GLIB_AVAILABLE_IN_2_32 GType g_remote_action_group_get_type (void) G_GNUC_CONST; +GLIB_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 void g_remote_action_group_change_action_state_full (GRemoteActionGroup *remote, const gchar *action_name, GVariant *value, diff --git a/gio/gresource.h b/gio/gresource.h index 26b9a75..15bfc8a 100644 --- a/gio/gresource.h +++ b/gio/gresource.h @@ -59,25 +59,33 @@ struct _GStaticResource { gpointer padding; }; +GLIB_AVAILABLE_IN_2_32 GType g_resource_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 GResource * g_resource_new_from_data (GBytes *data, GError **error); GResource * g_resource_ref (GResource *resource); +GLIB_AVAILABLE_IN_2_32 void g_resource_unref (GResource *resource); +GLIB_AVAILABLE_IN_2_32 GResource * g_resource_load (const gchar *filename, GError **error); +GLIB_AVAILABLE_IN_2_32 GInputStream *g_resource_open_stream (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, GError **error); +GLIB_AVAILABLE_IN_2_32 GBytes * g_resource_lookup_data (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, GError **error); +GLIB_AVAILABLE_IN_2_32 char ** g_resource_enumerate_children (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, GError **error); +GLIB_AVAILABLE_IN_2_32 gboolean g_resource_get_info (GResource *resource, const char *path, GResourceLookupFlags lookup_flags, @@ -85,17 +93,23 @@ gboolean g_resource_get_info (GResource *resource, guint32 *flags, GError **error); +GLIB_AVAILABLE_IN_2_32 void g_resources_register (GResource *resource); +GLIB_AVAILABLE_IN_2_32 void g_resources_unregister (GResource *resource); +GLIB_AVAILABLE_IN_2_32 GInputStream *g_resources_open_stream (const char *path, GResourceLookupFlags lookup_flags, GError **error); +GLIB_AVAILABLE_IN_2_32 GBytes * g_resources_lookup_data (const char *path, GResourceLookupFlags lookup_flags, GError **error); +GLIB_AVAILABLE_IN_2_32 char ** g_resources_enumerate_children (const char *path, GResourceLookupFlags lookup_flags, GError **error); +GLIB_AVAILABLE_IN_2_32 gboolean g_resources_get_info (const char *path, GResourceLookupFlags lookup_flags, gsize *size, @@ -103,8 +117,11 @@ gboolean g_resources_get_info (const char *path, GError **error); +GLIB_AVAILABLE_IN_2_32 void g_static_resource_init (GStaticResource *static_resource); +GLIB_AVAILABLE_IN_2_32 void g_static_resource_fini (GStaticResource *static_resource); +GLIB_AVAILABLE_IN_2_32 GResource *g_static_resource_get_resource (GStaticResource *static_resource); G_END_DECLS diff --git a/gio/gsettings.h b/gio/gsettings.h index 5c18842..01f3e9e 100644 --- a/gio/gsettings.h +++ b/gio/gsettings.h @@ -81,6 +81,7 @@ GSettings * g_settings_new_with_backend (const g GSettings * g_settings_new_with_backend_and_path (const gchar *schema_id, GSettingsBackend *backend, const gchar *path); +GLIB_AVAILABLE_IN_2_32 GSettings * g_settings_new_full (GSettingsSchema *schema, GSettingsBackend *backend, const gchar *path); @@ -267,6 +268,7 @@ void g_settings_bind_writable (GSettin void g_settings_unbind (gpointer object, const gchar *property); +GLIB_AVAILABLE_IN_2_32 GAction * g_settings_create_action (GSettings *settings, const gchar *key); diff --git a/gio/gsettingsschema.h b/gio/gsettingsschema.h index b6974df..277907d 100644 --- a/gio/gsettingsschema.h +++ b/gio/gsettingsschema.h @@ -27,10 +27,14 @@ typedef struct _GSettingsSchemaSource GSettingsSchemaSourc typedef struct _GSettingsSchema GSettingsSchema; #define G_TYPE_SETTINGS_SCHEMA_SOURCE (g_settings_schema_source_get_type ()) +GLIB_AVAILABLE_IN_2_32 GType g_settings_schema_source_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 GSettingsSchemaSource * g_settings_schema_source_get_default (void); +GLIB_AVAILABLE_IN_2_32 GSettingsSchemaSource * g_settings_schema_source_ref (GSettingsSchemaSource *source); +GLIB_AVAILABLE_IN_2_32 void g_settings_schema_source_unref (GSettingsSchemaSource *source); GSettingsSchemaSource * g_settings_schema_source_new_from_directory (const gchar *directory, @@ -43,9 +47,12 @@ GSettingsSchema * g_settings_schema_source_lookup (GSettin gboolean recursive); #define G_TYPE_SETTINGS_SCHEMA (g_settings_schema_get_type ()) +GLIB_AVAILABLE_IN_2_32 GType g_settings_schema_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 GSettingsSchema * g_settings_schema_ref (GSettingsSchema *schema); +GLIB_AVAILABLE_IN_2_32 void g_settings_schema_unref (GSettingsSchema *schema); const gchar * g_settings_schema_get_id (GSettingsSchema *schema); diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h index 7d786fc..7497630 100644 --- a/gio/gsimpleasyncresult.h +++ b/gio/gsimpleasyncresult.h @@ -83,6 +83,7 @@ gboolean g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResul +GLIB_AVAILABLE_IN_2_32 void g_simple_async_result_set_check_cancellable (GSimpleAsyncResult *simple, GCancellable *check_cancellable); gpointer g_simple_async_result_get_source_tag (GSimpleAsyncResult *simple); diff --git a/gio/gsocket.h b/gio/gsocket.h index d817328..29ba44f 100644 --- a/gio/gsocket.h +++ b/gio/gsocket.h @@ -101,18 +101,26 @@ guint g_socket_get_timeout (GSocket void g_socket_set_timeout (GSocket *socket, guint timeout); +GLIB_AVAILABLE_IN_2_32 guint g_socket_get_ttl (GSocket *socket); +GLIB_AVAILABLE_IN_2_32 void g_socket_set_ttl (GSocket *socket, guint ttl); +GLIB_AVAILABLE_IN_2_32 gboolean g_socket_get_broadcast (GSocket *socket); +GLIB_AVAILABLE_IN_2_32 void g_socket_set_broadcast (GSocket *socket, gboolean broadcast); +GLIB_AVAILABLE_IN_2_32 gboolean g_socket_get_multicast_loopback (GSocket *socket); +GLIB_AVAILABLE_IN_2_32 void g_socket_set_multicast_loopback (GSocket *socket, gboolean loopback); +GLIB_AVAILABLE_IN_2_32 guint g_socket_get_multicast_ttl (GSocket *socket); +GLIB_AVAILABLE_IN_2_32 void g_socket_set_multicast_ttl (GSocket *socket, guint ttl); gboolean g_socket_is_connected (GSocket *socket); @@ -120,11 +128,13 @@ gboolean g_socket_bind (GSocket GSocketAddress *address, gboolean allow_reuse, GError **error); +GLIB_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 gboolean g_socket_leave_multicast_group (GSocket *socket, GInetAddress *group, gboolean source_specific, @@ -145,6 +155,7 @@ gboolean g_socket_condition_wait (GSocket GIOCondition condition, GCancellable *cancellable, GError **error); +GLIB_AVAILABLE_IN_2_32 gboolean g_socket_condition_timed_wait (GSocket *socket, GIOCondition condition, gint64 timeout, diff --git a/gio/gsocketconnection.h b/gio/gsocketconnection.h index 34a0cb1..0daa5f3 100644 --- a/gio/gsocketconnection.h +++ b/gio/gsocketconnection.h @@ -72,16 +72,20 @@ struct _GSocketConnection GType g_socket_connection_get_type (void) G_GNUC_CONST; +GLIB_AVAILABLE_IN_2_32 gboolean g_socket_connection_is_connected (GSocketConnection *connection); +GLIB_AVAILABLE_IN_2_32 gboolean g_socket_connection_connect (GSocketConnection *connection, GSocketAddress *address, GCancellable *cancellable, GError **error); +GLIB_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 gboolean g_socket_connection_connect_finish (GSocketConnection *connection, GAsyncResult *result, GError **error); diff --git a/gio/gunixconnection.h b/gio/gunixconnection.h index 018b08d..83f2c98 100644 --- a/gio/gunixconnection.h +++ b/gio/gunixconnection.h @@ -67,17 +67,21 @@ gint g_unix_connection_receive_fd (GUnixCo gboolean g_unix_connection_send_credentials (GUnixConnection *connection, GCancellable *cancellable, GError **error); +GLIB_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 gboolean g_unix_connection_send_credentials_finish (GUnixConnection *connection, GAsyncResult *result, GError **error); +GLIB_AVAILABLE_IN_2_32 GCredentials *g_unix_connection_receive_credentials (GUnixConnection *connection, GCancellable *cancellable, GError **error); +GLIB_AVAILABLE_IN_2_32 void g_unix_connection_receive_credentials_async (GUnixConnection *connection, GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/gio/gunixmounts.h b/gio/gunixmounts.h index ea67244..5bcc1ac 100644 --- a/gio/gunixmounts.h +++ b/gio/gunixmounts.h @@ -76,6 +76,7 @@ gint g_unix_mount_point_compare (GUnixMountPoint *mount1, const char * g_unix_mount_point_get_mount_path (GUnixMountPoint *mount_point); const char * g_unix_mount_point_get_device_path (GUnixMountPoint *mount_point); const char * g_unix_mount_point_get_fs_type (GUnixMountPoint *mount_point); +GLIB_AVAILABLE_IN_2_32 const char * g_unix_mount_point_get_options (GUnixMountPoint *mount_point); gboolean g_unix_mount_point_is_readonly (GUnixMountPoint *mount_point); gboolean g_unix_mount_point_is_user_mountable (GUnixMountPoint *mount_point); diff --git a/gio/gvolume.h b/gio/gvolume.h index faa34e8..dffab7a 100644 --- a/gio/gvolume.h +++ b/gio/gvolume.h @@ -228,6 +228,7 @@ gboolean g_volume_eject_with_operation_finish (GVolume *volume, GAsyncResult *result, GError **error); +GLIB_AVAILABLE_IN_2_32 const gchar *g_volume_get_sort_key (GVolume *volume); G_END_DECLS -- 2.7.4