pidgin/pidgin

Merged in default (pull request #599)

2019-10-13, Gary Kramlich
c9d58078b1e1
Parents d76cbf47c896c73eea1a860d
Children 75d0b54c40f2
Merged in default (pull request #599)

Add G_GNUC_BEGIN_IGNORE_DEPRECATIONS around uses of GParameter in our API

Approved-by: Elliott Sales de Andrade
2 files changed, 11 insertions(+), 0 deletions(-)
  • +9 -0
    libpurple/media/backend-iface.h
  • +2 -0
    libpurple/protocols/jabber/jingle/jingle.h
    • --- a/libpurple/media/backend-iface.h Fri Oct 11 21:47:21 2019 -0400
    +++ b/libpurple/media/backend-iface.h Sun Oct 13 00:16:37 2019 +0000
    @@ -61,11 +61,14 @@
    /*< public >*/
    /* Implementable functions called with purple_media_backend_* */
    + G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    gboolean (*add_stream) (PurpleMediaBackend *self,
    const gchar *sess_id, const gchar *who,
    PurpleMediaSessionType type, gboolean initiator,
    const gchar *transmitter,
    guint num_params, GParameter *params);
    + G_GNUC_END_IGNORE_DEPRECATIONS
    +
    void (*add_remote_candidates) (PurpleMediaBackend *self,
    const gchar *sess_id, const gchar *participant,
    GList *remote_candidates);
    @@ -87,8 +90,10 @@
    const gchar *sess_id, const gchar *participant,
    const gchar *cipher, const gchar *auth,
    const gchar *key, gsize key_len);
    + G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    void (*set_params) (PurpleMediaBackend *self,
    guint num_params, GParameter *params);
    + G_GNUC_END_IGNORE_DEPRECATIONS
    const gchar **(*get_available_params) (void);
    gboolean (*send_dtmf) (PurpleMediaBackend *self,
    const gchar *sess_id, gchar dtmf, guint8 volume,
    @@ -121,11 +126,13 @@
    *
    * Returns: True if the stream was successfully created, othewise False.
    */
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    gboolean purple_media_backend_add_stream(PurpleMediaBackend *self,
    const gchar *sess_id, const gchar *who,
    PurpleMediaSessionType type, gboolean initiator,
    const gchar *transmitter,
    guint num_params, GParameter *params);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    /**
    * purple_media_backend_add_remote_candidates:
    @@ -254,8 +261,10 @@
    *
    * Sets various optional parameters of the media backend.
    */
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    void purple_media_backend_set_params(PurpleMediaBackend *self,
    guint num_params, GParameter *params);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    /**
    * purple_media_backend_get_available_params:
    --- a/libpurple/protocols/jabber/jingle/jingle.h Fri Oct 11 21:47:21 2019 -0400
    +++ b/libpurple/protocols/jabber/jingle/jingle.h Sun Oct 13 00:16:37 2019 +0000
    @@ -77,9 +77,11 @@
    #ifdef USE_VV
    /* create a GParam array given autoconfigured STUN (and later perhaps TURN).
    if google_talk is TRUE, set compatability mode to GOOGLE_TALK */
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip,
    guint relay_udp, guint relay_tcp, guint relay_ssltcp,
    const gchar *relay_username, const gchar *relay_password, guint *num_params);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    #endif
    G_END_DECLS