Commit ff2dafb2 authored by Matthias Clasen's avatar Matthias Clasen

Add G_GNUC_DEPRECATED to deprecated functions in gio

parent 93b3f647
......@@ -99,6 +99,8 @@ GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CON
GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
const char *uri_scheme);
#endif /* G_DISABLE_DEPRECATED */
/**
* GDesktopAppLaunchCallback:
* @appinfo: a #GDesktopAppInfo
......@@ -123,7 +125,6 @@ gboolean g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo
gpointer pid_callback_data,
GError **error);
#endif /* G_DISABLE_DEPRECATED */
G_END_DECLS
......
......@@ -34,7 +34,7 @@ G_BEGIN_DECLS
#define G_TYPE_DRIVE (g_drive_get_type ())
#define G_DRIVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DRIVE, GDrive))
#define G_IS_DRIVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DRIVE))
#define G_IS_DRIVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DRIVE))
#define G_DRIVE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DRIVE, GDriveIface))
/**
......@@ -166,13 +166,13 @@ gboolean g_drive_can_poll_for_media (GDrive *drive);
gboolean g_drive_can_eject (GDrive *drive);
#ifndef G_DISABLE_DEPRECATED
void g_drive_eject (GDrive *drive,
GMountUnmountFlags flags,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gpointer user_data) G_GNUC_DEPRECATED_FOR(g_drive_eject_with_operation);
gboolean g_drive_eject_finish (GDrive *drive,
GAsyncResult *result,
GError **error);
GError **error) G_GNUC_DEPRECATED_FOR(g_drive_eject_with_operation_finish);
#endif
void g_drive_poll_for_media (GDrive *drive,
GCancellable *cancellable,
......@@ -182,7 +182,7 @@ gboolean g_drive_poll_for_media_finish (GDrive *drive,
GAsyncResult *result,
GError **error);
char * g_drive_get_identifier (GDrive *drive,
const char *kind);
const char *kind);
char ** g_drive_enumerate_identifiers (GDrive *drive);
GDriveStartStopType g_drive_get_start_stop_type (GDrive *drive);
......@@ -201,7 +201,7 @@ gboolean g_drive_start_finish (GDrive *drive,
gboolean g_drive_can_stop (GDrive *drive);
void g_drive_stop (GDrive *drive,
GMountUnmountFlags flags,
GMountUnmountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
......
......@@ -871,13 +871,13 @@ GFile * g_file_mount_mountable_finish (GFile
GError **error);
#ifndef G_DISABLE_DEPRECATED
void g_file_unmount_mountable (GFile *file,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data) G_GNUC_DEPRECATED_FOR(g_file_unmount_mountable_with_operation);
gboolean g_file_unmount_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
GAsyncResult *result,
GError **error) G_GNUC_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish);
#endif
void g_file_unmount_mountable_with_operation (GFile *file,
GMountUnmountFlags flags,
......@@ -890,13 +890,13 @@ gboolean g_file_unmount_mountable_with_operation_finish (GFile
GError **error);
#ifndef G_DISABLE_DEPRECATED
void g_file_eject_mountable (GFile *file,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data) G_GNUC_DEPRECATED_FOR(g_file_eject_mountable_with_operation);
gboolean g_file_eject_mountable_finish (GFile *file,
GAsyncResult *result,
GError **error);
GAsyncResult *result,
GError **error) G_GNUC_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish);
#endif
void g_file_eject_mountable_with_operation (GFile *file,
GMountUnmountFlags flags,
......
......@@ -175,19 +175,19 @@ void g_mount_unmount (GMount *mount,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gpointer user_data) G_GNUC_DEPRECATED_FOR(g_mount_unmount_with_operation);
gboolean g_mount_unmount_finish (GMount *mount,
GAsyncResult *result,
GError **error);
GError **error) G_GNUC_DEPRECATED_FOR(g_mount_unmount_with_operation_finish);
void g_mount_eject (GMount *mount,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gpointer user_data) G_GNUC_DEPRECATED_FOR(g_mount_eject_with_operation);
gboolean g_mount_eject_finish (GMount *mount,
GAsyncResult *result,
GError **error);
GError **error) G_GNUC_DEPRECATED_FOR(g_mount_eject_with_operation_finish);
#endif
void g_mount_remount (GMount *mount,
......
......@@ -85,8 +85,8 @@ GType g_tls_connection_get_type (void) G_GNUC
#ifndef G_DISABLE_DEPRECATED
void g_tls_connection_set_use_system_certdb (GTlsConnection *conn,
gboolean use_system_certdb);
gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn);
gboolean use_system_certdb) G_GNUC_DEPRECATED;
gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn) G_GNUC_DEPRECATED;
#endif /* G_DISABLE_DEPRECATED */
void g_tls_connection_set_database (GTlsConnection *conn,
......
......@@ -57,16 +57,16 @@ GType g_unix_socket_address_get_type (void) G_GNUC_CONST;
GSocketAddress *g_unix_socket_address_new (const gchar *path);
#ifndef G_DISABLE_DEPRECATED
GSocketAddress *g_unix_socket_address_new_abstract (const gchar *path,
gint path_len);
gint path_len) G_GNUC_DEPRECATED_FOR(g_unix_socket_address_new_with_type);
#endif
GSocketAddress *g_unix_socket_address_new_with_type (const gchar *path,
gint path_len,
GUnixSocketAddressType type);
gint path_len,
GUnixSocketAddressType type);
const char * g_unix_socket_address_get_path (GUnixSocketAddress *address);
gsize g_unix_socket_address_get_path_len (GUnixSocketAddress *address);
GUnixSocketAddressType g_unix_socket_address_get_address_type (GUnixSocketAddress *address);
#ifndef G_DISABLE_DEPRECATED
gboolean g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address);
gboolean g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address) G_GNUC_DEPRECATED;
#endif
gboolean g_unix_socket_address_abstract_names_supported (void);
......
......@@ -182,13 +182,13 @@ gboolean g_volume_mount_finish (GVolume *volume,
GError **error);
#ifndef G_DISABLE_DEPRECATED
void g_volume_eject (GVolume *volume,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data) G_GNUC_DEPRECATED_FOR(g_volume_eject_with_operation);
gboolean g_volume_eject_finish (GVolume *volume,
GAsyncResult *result,
GError **error);
GAsyncResult *result,
GError **error) G_GNUC_DEPRECATED_FOR(g_volume_eject_with_operation_finish);
#endif
char * g_volume_get_identifier (GVolume *volume,
const char *kind);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment