luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

GIO: Don't use G_DISABLE_DEPRECATED for functions

Browse Source
This commit is contained in:
Matthias Clasen 2011-11-03 00:16:41 -04:00
parent 328be3938e
commit 5896808e8c
10 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdesktopappinfo.c
View File

@ -32,8 +32,6 @@
#include <crt_externs.h> #include <crt_externs.h>
#endif #endif
#undef G_DISABLE_DEPRECATED
#include "gcontenttypeprivate.h" #include "gcontenttypeprivate.h"
#include "gdesktopappinfo.h" #include "gdesktopappinfo.h"
#include "gfile.h" #include "gfile.h"

6
gio/gdesktopappinfo.h
View File

@ -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" #define G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME "gio-desktop-app-info-lookup"
#endif /* G_DISABLE_DEPRECATED */
/** /**
* GDesktopAppInfoLookup: * GDesktopAppInfoLookup:
* *
@ -95,13 +97,13 @@ struct _GDesktopAppInfoLookupIface
const char *uri_scheme); const char *uri_scheme);
}; };
GLIB_DEPRECATED
GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST; 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, GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
const char *uri_scheme); const char *uri_scheme);
#endif /* G_DISABLE_DEPRECATED */
/** /**
* GDesktopAppLaunchCallback: * GDesktopAppLaunchCallback:
* @appinfo: a #GDesktopAppInfo * @appinfo: a #GDesktopAppInfo

2
gio/gdrive.h
View File

@ -167,7 +167,6 @@ gboolean g_drive_has_media (GDrive *drive);
gboolean g_drive_is_media_check_automatic (GDrive *drive); gboolean g_drive_is_media_check_automatic (GDrive *drive);
gboolean g_drive_can_poll_for_media (GDrive *drive); gboolean g_drive_can_poll_for_media (GDrive *drive);
gboolean g_drive_can_eject (GDrive *drive); gboolean g_drive_can_eject (GDrive *drive);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_drive_eject_with_operation) GLIB_DEPRECATED_FOR(g_drive_eject_with_operation)
void g_drive_eject (GDrive *drive, void g_drive_eject (GDrive *drive,
GMountUnmountFlags flags, GMountUnmountFlags flags,
@ -179,7 +178,6 @@ GLIB_DEPRECATED_FOR(g_drive_eject_with_operation_finish)
gboolean g_drive_eject_finish (GDrive *drive, gboolean g_drive_eject_finish (GDrive *drive,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#endif
void g_drive_poll_for_media (GDrive *drive, void g_drive_poll_for_media (GDrive *drive,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,

4
gio/gfile.h
View File

@ -869,7 +869,6 @@ void g_file_mount_mountable (GFile
GFile * g_file_mount_mountable_finish (GFile *file, GFile * g_file_mount_mountable_finish (GFile *file,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation) GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation)
void g_file_unmount_mountable (GFile *file, void g_file_unmount_mountable (GFile *file,
GMountUnmountFlags flags, GMountUnmountFlags flags,
@ -881,7 +880,6 @@ GLIB_DEPRECATED_FOR(g_file_unmount_mountable_with_operation_finish)
gboolean g_file_unmount_mountable_finish (GFile *file, gboolean g_file_unmount_mountable_finish (GFile *file,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#endif
void g_file_unmount_mountable_with_operation (GFile *file, void g_file_unmount_mountable_with_operation (GFile *file,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GMountOperation *mount_operation, 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, gboolean g_file_unmount_mountable_with_operation_finish (GFile *file,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation) GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation)
void g_file_eject_mountable (GFile *file, void g_file_eject_mountable (GFile *file,
GMountUnmountFlags flags, GMountUnmountFlags flags,
@ -903,7 +900,6 @@ GLIB_DEPRECATED_FOR(g_file_eject_mountable_with_operation_finish)
gboolean g_file_eject_mountable_finish (GFile *file, gboolean g_file_eject_mountable_finish (GFile *file,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#endif
void g_file_eject_mountable_with_operation (GFile *file, void g_file_eject_mountable_with_operation (GFile *file,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GMountOperation *mount_operation, GMountOperation *mount_operation,

2
gio/giomodule.c
View File

@ -42,8 +42,6 @@
#endif #endif
#include <glib/gstdio.h> #include <glib/gstdio.h>
#undef G_DISABLE_DEPRECATED
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
#include "gdesktopappinfo.h" #include "gdesktopappinfo.h"
#endif #endif

2
gio/gmount.h
View File

@ -173,7 +173,6 @@ GDrive * g_mount_get_drive (GMount *mount);
gboolean g_mount_can_unmount (GMount *mount); gboolean g_mount_can_unmount (GMount *mount);
gboolean g_mount_can_eject (GMount *mount); gboolean g_mount_can_eject (GMount *mount);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation) GLIB_DEPRECATED_FOR(g_mount_unmount_with_operation)
void g_mount_unmount (GMount *mount, void g_mount_unmount (GMount *mount,
GMountUnmountFlags flags, GMountUnmountFlags flags,
@ -197,7 +196,6 @@ GLIB_DEPRECATED_FOR(g_mount_eject_with_operation_finish)
gboolean g_mount_eject_finish (GMount *mount, gboolean g_mount_eject_finish (GMount *mount,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#endif
void g_mount_remount (GMount *mount, void g_mount_remount (GMount *mount,
GMountMountFlags flags, GMountMountFlags flags,

5
gio/gtlsconnection.h
View File

@ -83,12 +83,11 @@ struct _GTlsConnectionClass
GType g_tls_connection_get_type (void) G_GNUC_CONST; GType g_tls_connection_get_type (void) G_GNUC_CONST;
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED GLIB_DEPRECATED
void g_tls_connection_set_use_system_certdb (GTlsConnection *conn, void g_tls_connection_set_use_system_certdb (GTlsConnection *conn,
gboolean use_system_certdb); gboolean use_system_certdb);
GLIB_DEPRECATED gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn); GLIB_DEPRECATED
#endif /* G_DISABLE_DEPRECATED */ gboolean g_tls_connection_get_use_system_certdb (GTlsConnection *conn);
void g_tls_connection_set_database (GTlsConnection *conn, void g_tls_connection_set_database (GTlsConnection *conn,
GTlsDatabase *database); GTlsDatabase *database);

4
gio/gunixsocketaddress.h
View File

@ -55,21 +55,17 @@ struct _GUnixSocketAddressClass
GType g_unix_socket_address_get_type (void) G_GNUC_CONST; GType g_unix_socket_address_get_type (void) G_GNUC_CONST;
GSocketAddress *g_unix_socket_address_new (const gchar *path); GSocketAddress *g_unix_socket_address_new (const gchar *path);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_unix_socket_address_new_with_type) GLIB_DEPRECATED_FOR(g_unix_socket_address_new_with_type)
GSocketAddress *g_unix_socket_address_new_abstract (const gchar *path, GSocketAddress *g_unix_socket_address_new_abstract (const gchar *path,
gint path_len); gint path_len);
#endif
GSocketAddress *g_unix_socket_address_new_with_type (const gchar *path, GSocketAddress *g_unix_socket_address_new_with_type (const gchar *path,
gint path_len, gint path_len,
GUnixSocketAddressType type); GUnixSocketAddressType type);
const char * g_unix_socket_address_get_path (GUnixSocketAddress *address); const char * g_unix_socket_address_get_path (GUnixSocketAddress *address);
gsize g_unix_socket_address_get_path_len (GUnixSocketAddress *address); gsize g_unix_socket_address_get_path_len (GUnixSocketAddress *address);
GUnixSocketAddressType g_unix_socket_address_get_address_type (GUnixSocketAddress *address); GUnixSocketAddressType g_unix_socket_address_get_address_type (GUnixSocketAddress *address);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED GLIB_DEPRECATED
gboolean g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address); gboolean g_unix_socket_address_get_is_abstract (GUnixSocketAddress *address);
#endif
gboolean g_unix_socket_address_abstract_names_supported (void); gboolean g_unix_socket_address_abstract_names_supported (void);

2
gio/gvolume.h
View File

@ -183,7 +183,6 @@ void g_volume_mount (GVolume *volume,
gboolean g_volume_mount_finish (GVolume *volume, gboolean g_volume_mount_finish (GVolume *volume,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_FOR(g_volume_eject_with_operation) GLIB_DEPRECATED_FOR(g_volume_eject_with_operation)
void g_volume_eject (GVolume *volume, void g_volume_eject (GVolume *volume,
GMountUnmountFlags flags, GMountUnmountFlags flags,
@ -195,7 +194,6 @@ GLIB_DEPRECATED_FOR(g_volume_eject_with_operation_finish)
gboolean g_volume_eject_finish (GVolume *volume, gboolean g_volume_eject_finish (GVolume *volume,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#endif
char * g_volume_get_identifier (GVolume *volume, char * g_volume_get_identifier (GVolume *volume,
const char *kind); const char *kind);
char ** g_volume_enumerate_identifiers (GVolume *volume); char ** g_volume_enumerate_identifiers (GVolume *volume);

3
gio/gvolumemonitor.h
View File

@ -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, GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor,
const char *uuid); const char *uuid);
#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED
GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount); GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount);
#endif
G_END_DECLS G_END_DECLS