pidgin/android/libpurple2

Ignore some deprecations.

2013-02-04, Elliott Sales de Andrade
3c73956dbeca
Parents 965b390b28c5
Children 0244bd75fd8a
Ignore some deprecations.

These GValueArray things are forced on us by GStreamer, so until they
change their API, the warnings won't be going away.
3 files changed, 20 insertions(+), 4 deletions(-)
  • +8 -0
    libpurple/glibcompat.h
  • +10 -4
    libpurple/media/backend-fs2.c
  • +2 -0
    pidgin/gtkprefs.c
    • --- a/libpurple/glibcompat.h Mon Feb 04 21:53:59 2013 -0500
    +++ b/libpurple/glibcompat.h Mon Feb 04 21:56:45 2013 -0500
    @@ -25,6 +25,11 @@
    * Also, any public API should not depend on this file.
    */
    +#if !GLIB_CHECK_VERSION(2, 32, 0)
    +
    +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    +#define G_GNUC_END_IGNORE_DEPRECATIONS
    +
    #if !GLIB_CHECK_VERSION(2, 28, 0)
    static inline gint64 g_get_monotonic_time(void)
    @@ -50,4 +55,7 @@
    #endif /* 2.28.0 */
    +#endif /* 2.32.0 */
    +
    #endif /* _PIDGINGLIBCOMPAT_H_ */
    +
    --- a/libpurple/media/backend-fs2.c Mon Feb 04 21:53:59 2013 -0500
    +++ b/libpurple/media/backend-fs2.c Mon Feb 04 21:56:45 2013 -0500
    @@ -826,7 +826,9 @@
    list = gst_structure_get_value(gst_message_get_structure(msg), value_name);
    #if GST_CHECK_VERSION(1,0,0)
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    value = g_value_array_get_nth(g_value_get_boxed(list), 0);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    #else
    value = gst_value_list_get_value(list, 0);
    #endif
    @@ -1894,7 +1896,9 @@
    memset(&value, 0, sizeof(GValue));
    g_value_init(&value, GST_TYPE_STRUCTURE);
    gst_value_set_structure(&value, turn_setup);
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    relay_info = g_value_array_append(relay_info, &value);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    gst_structure_free(turn_setup);
    }
    @@ -1989,7 +1993,9 @@
    }
    if (turn_ip && !strcmp("nice", transmitter) && !got_turn_from_prpl) {
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    GValueArray *relay_info = g_value_array_new(0);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    gint port;
    const gchar *username = purple_prefs_get_string(
    "/purple/network/turn_username");
    @@ -2016,11 +2022,11 @@
    purple_debug_info("backend-fs2",
    "Setting relay-info on new stream\n");
    _params[_num_params].name = "relay-info";
    - g_value_init(&_params[_num_params].value,
    - G_TYPE_VALUE_ARRAY);
    - g_value_set_boxed(&_params[_num_params].value,
    - relay_info);
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    + g_value_init(&_params[_num_params].value, G_TYPE_VALUE_ARRAY);
    + g_value_set_boxed(&_params[_num_params].value, relay_info);
    g_value_array_free(relay_info);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    _num_params++;
    }
    --- a/pidgin/gtkprefs.c Mon Feb 04 21:53:59 2013 -0500
    +++ b/pidgin/gtkprefs.c Mon Feb 04 21:56:45 2013 -0500
    @@ -3309,7 +3309,9 @@
    list = gst_structure_get_value(gst_message_get_structure(msg), value_name);
    #if GST_CHECK_VERSION(1,0,0)
    +G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    value = g_value_array_get_nth(g_value_get_boxed(list), 0);
    +G_GNUC_END_IGNORE_DEPRECATIONS
    #else
    value = gst_value_list_get_value(list, 0);
    #endif