luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "headers: Add various missing G_DISABLE_DEPRECATED guards"

Browse Source 
This reverts commit 80fcb1bc26.

G_DISABLE_DEPRECATED should never be used by anybody, least of all by
GLib. We have deprecation annotations for the compiler, these days, and
they are much better suited than a macro that makes symbols appear and
disappear. The fact that gtk-doc doesn't understand the deprecation
annotations is a limitation of gtk-doc, and it's gtk-doc that ought to be
fixed.

Commit 80fcb1bc broke GStreamer, which disables old API that was
deprecated before the introduction of the deprecation annotations, but
still uses newly deprecated one, and relies on the deprecation
annotations to do their thing. It also broke libsoup, as it uses
GValueArray in its own API.
This commit is contained in:
Emmanuele Bassi
2019-03-15 18:30:16 +00:00
parent fd42994015
commit e5ba5845a1
13 changed files with 5 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdtlsconnection.h
View File

@@ -129,13 +129,11 @@ void g_dtls_connection_set_require_close_notify (GDtlsConnec
GLIB_AVAILABLE_IN_2_48
gboolean g_dtls_connection_get_require_close_notify (GDtlsConnection *conn);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_IN_2_60
void g_dtls_connection_set_rehandshake_mode (GDtlsConnection *conn,
GTlsRehandshakeMode mode);
GLIB_DEPRECATED_IN_2_60
GTlsRehandshakeMode g_dtls_connection_get_rehandshake_mode (GDtlsConnection *conn);
#endif /* !G_DISABLE_DEPRECATED */
GLIB_AVAILABLE_IN_2_48
gboolean g_dtls_connection_handshake (GDtlsConnection *conn,

2
gio/gioenums.h
View File

@@ -1603,7 +1603,6 @@ typedef enum {
G_TLS_AUTHENTICATION_REQUIRED
} GTlsAuthenticationMode;
#ifndef G_DISABLE_DEPRECATED
/**
* GTlsRehandshakeMode:
* @G_TLS_REHANDSHAKE_NEVER: Never allow rehandshaking
@@ -1624,7 +1623,6 @@ typedef enum {
G_TLS_REHANDSHAKE_SAFELY,
G_TLS_REHANDSHAKE_UNSAFELY
} GTlsRehandshakeMode;
#endif /* !G_DISABLE_DEPRECATED */
/**
* GTlsPasswordFlags:

3
gio/gsimpleasyncresult.h
View File

@@ -92,12 +92,9 @@ gboolean g_simple_async_result_get_op_res_gboolean (GSimpleAsyncResul
#ifndef G_DISABLE_DEPRECATED
GLIB_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);
#endif /* !G_DISABLE_DEPRECATED */
GLIB_DEPRECATED_IN_2_46
gpointer g_simple_async_result_get_source_tag (GSimpleAsyncResult *simple);
GLIB_DEPRECATED_IN_2_46

2
gio/gtlsconnection.h
View File

@@ -109,13 +109,11 @@ void g_tls_connection_set_require_close_notify (GTlsConnecti
GLIB_AVAILABLE_IN_ALL
gboolean g_tls_connection_get_require_close_notify (GTlsConnection *conn);
#ifndef G_DISABLE_DEPRECATED
GLIB_DEPRECATED_IN_2_60
void g_tls_connection_set_rehandshake_mode (GTlsConnection *conn,
GTlsRehandshakeMode mode);
GLIB_DEPRECATED_IN_2_60
GTlsRehandshakeMode g_tls_connection_get_rehandshake_mode (GTlsConnection *conn);
#endif /* !G_DISABLE_DEPRECATED */
GLIB_AVAILABLE_IN_2_60
void g_tls_connection_set_advertised_protocols (GTlsConnection *conn,