From 5896808e8c6a66db34d9c0c5562a3bef00357a25 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 3 Nov 2011 00:16:41 -0400 Subject: [PATCH] GIO: Don't use G_DISABLE_DEPRECATED for functions --- gio/gdesktopappinfo.c | 2 -- gio/gdesktopappinfo.h | 6 ++++-- gio/gdrive.h | 2 -- gio/gfile.h | 4 ---- gio/giomodule.c | 2 -- gio/gmount.h | 2 -- gio/gtlsconnection.h | 5 ++--- gio/gunixsocketaddress.h | 4 ---- gio/gvolume.h | 2 -- gio/gvolumemonitor.h | 3 +-- 10 files changed, 7 insertions(+), 25 deletions(-) diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index a93f473..040028f 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -32,8 +32,6 @@ #include #endif -#undef G_DISABLE_DEPRECATED - #include "gcontenttypeprivate.h" #include "gdesktopappinfo.h" #include "gfile.h" diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h index 392dca7..fcc41ed 100644 --- a/gio/gdesktopappinfo.h +++ b/gio/gdesktopappinfo.h @@ -78,6 +78,8 @@ void g_desktop_app_info_set_desktop_env (const char *desktop_ */ #define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup" +#endif /* G_DISABLE_DEPRECATED */ + /** * GDesktopAppInfoLookup: * @@ -95,13 +97,13 @@ struct _GDesktopAppInfoLookupIface const char *uri_scheme); }; +GLIB_DEPRECATED GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST; +GLIB_DEPRECATED 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 diff --git a/gio/gdrive.h b/gio/gdrive.h index 942edce..cb64e73 100644 --- a/gio/gdrive.h +++ b/gio/gdrive.h @@ -167,7 +167,6 @@ gboolean g_drive_has_media (GDrive *drive); gboolean g_drive_is_media_check_automatic (GDrive *drive); gboolean g_drive_can_poll_for_media (GDrive *drive); gboolean g_drive_can_eject (GDrive *drive); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_drive_eject_with_operation) void g_drive_eject (GDrive *drive, GMountUnmountFlags flags, @@ -179,7 +178,6 @@ GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish) gboolean g_drive_eject_finish (GDrive *drive, GAsyncResult *result, GError **error); -#endif void g_drive_poll_for_media (GDrive *drive, GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/gio/gfile.h b/gio/gfile.h index c2d61aa..500d7de 100644 --- a/gio/gfile.h +++ b/gio/gfile.h @@ -869,7 +869,6 @@ void g_file_mount_mountable (GFile GFile * g_file_mount_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation) void g_file_unmount_mountable (GFile *file, GMountUnmountFlags flags, @@ -881,7 +880,6 @@ GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish) gboolean g_file_unmount_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -#endif void g_file_unmount_mountable_with_operation (GFile *file, GMountUnmountFlags flags, GMountOperation *mount_operation, @@ -891,7 +889,6 @@ void g_file_unmount_mountable_with_operation (GFile gboolean g_file_unmount_mountable_with_operation_finish (GFile *file, GAsyncResult *result, GError **error); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation) void g_file_eject_mountable (GFile *file, GMountUnmountFlags flags, @@ -903,7 +900,6 @@ GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish) gboolean g_file_eject_mountable_finish (GFile *file, GAsyncResult *result, GError **error); -#endif void g_file_eject_mountable_with_operation (GFile *file, GMountUnmountFlags flags, GMountOperation *mount_operation, diff --git a/gio/giomodule.c b/gio/giomodule.c index eb8b35f..eac317a 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -42,8 +42,6 @@ #endif #include -#undef G_DISABLE_DEPRECATED - #ifdef G_OS_UNIX #include "gdesktopappinfo.h" #endif diff --git a/gio/gmount.h b/gio/gmount.h index f27c262..3beadad 100644 --- a/gio/gmount.h +++ b/gio/gmount.h @@ -173,7 +173,6 @@ GDrive * g_mount_get_drive (GMount *mount); gboolean g_mount_can_unmount (GMount *mount); gboolean g_mount_can_eject (GMount *mount); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation) void g_mount_unmount (GMount *mount, GMountUnmountFlags flags, @@ -197,7 +196,6 @@ GLIB_DEPRECATED_FOR(g_mount_eject_with_operation_finish) gboolean g_mount_eject_finish (GMount *mount, GAsyncResult *result, GError **error); -#endif void g_mount_remount (GMount *mount, GMountMountFlags flags, diff --git a/gio/gtlsconnection.h b/gio/gtlsconnection.h index 2df950d..550d540 100644 --- a/gio/gtlsconnection.h +++ b/gio/gtlsconnection.h @@ -83,12 +83,11 @@ struct _GTlsConnectionClass GType g_tls_connection_get_type (void) G_GNUC_CONST; -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED void g_tls_connection_set_use_system_certdb (GTlsConnection *conn, gboolean use_system_certdb); -GLIB_DEPRECATED gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn); -#endif /* G_DISABLE_DEPRECATED */ +GLIB_DEPRECATED +gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn); void g_tls_connection_set_database (GTlsConnection *conn, GTlsDatabase *database); diff --git a/gio/gunixsocketaddress.h b/gio/gunixsocketaddress.h index 68843f0..83ece0b 100644 --- a/gio/gunixsocketaddress.h +++ b/gio/gunixsocketaddress.h @@ -55,21 +55,17 @@ struct _GUnixSocketAddressClass GType g_unix_socket_address_get_type (void) G_GNUC_CONST; GSocketAddress *g_unix_socket_address_new (const gchar *path); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_unix_socket_address_new_with_type) GSocketAddress *g_unix_socket_address_new_abstract (const gchar *path, gint path_len); -#endif GSocketAddress *g_unix_socket_address_new_with_type (const gchar *path, 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 GLIB_DEPRECATED gboolean g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address); -#endif gboolean g_unix_socket_address_abstract_names_supported (void); diff --git a/gio/gvolume.h b/gio/gvolume.h index bf28a56..c707059 100644 --- a/gio/gvolume.h +++ b/gio/gvolume.h @@ -183,7 +183,6 @@ void g_volume_mount (GVolume *volume, gboolean g_volume_mount_finish (GVolume *volume, GAsyncResult *result, GError **error); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_volume_eject_with_operation) void g_volume_eject (GVolume *volume, GMountUnmountFlags flags, @@ -195,7 +194,6 @@ GLIB_DEPRECATED_FOR(g_volume_eject_with_operation_finish) gboolean g_volume_eject_finish (GVolume *volume, GAsyncResult *result, GError **error); -#endif char * g_volume_get_identifier (GVolume *volume, const char *kind); char ** g_volume_enumerate_identifiers (GVolume *volume); diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h index 5b47a9f..2bff07e 100644 --- a/gio/gvolumemonitor.h +++ b/gio/gvolumemonitor.h @@ -141,9 +141,8 @@ GVolume * g_volume_monitor_get_volume_for_uuid (GVolumeMonitor *volume_mo GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid); -#ifndef G_DISABLE_DEPRECATED +GLIB_DEPRECATED GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount); -#endif G_END_DECLS -- 2.7.4