eion/purple-hangouts

A better fix for ABI breakage than 1366d43, thanks @dequisdequis!
draft
2016-05-15, Eion Robb
27590d40a0a5
Parents c38eca26b899
Children 3147e11e4a1c
A better fix for ABI breakage than 1366d43, thanks @dequisdequis!
2 files changed, 5 insertions(+), 4 deletions(-)
  • +0 -3
    hangouts_media.c
  • +5 -1
    purplecompat.h
    • --- a/hangouts_media.c Sun May 15 12:44:21 2016 +1200
    +++ b/hangouts_media.c Sun May 15 13:00:18 2016 +1200
    @@ -216,9 +216,6 @@
    case PROTOCOL__SSLTCP:
    #if PURPLE_VERSION_CHECK(3, 0, 0)
    network_protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_ACTIVE;
    -#elif PURPLE_VERSION_CHECK(2, 10, 12)
    - // Handle ABI breakage in 2.10.12 - needs to have the same enum value as _TCP;
    - network_protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE;
    #else
    network_protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP;
    #endif
    --- a/purplecompat.h Sun May 15 12:44:21 2016 +1200
    +++ b/purplecompat.h Sun May 15 13:00:18 2016 +1200
    @@ -20,7 +20,7 @@
    #define purple_chat_user_set_alias(cb, alias) g_object_set((cb), "alias", (alias), NULL)
    -#else
    +#else /*!PURPLE_VERSION_CHECK(3, 0, 0)*/
    #include "connection.h"
    @@ -119,6 +119,10 @@
    #define PURPLE_IM_TYPED PURPLE_TYPED
    #define purple_media_set_protocol_data purple_media_set_prpl_data
    +#if PURPLE_VERSION_CHECK(2, 10, 12)
    +// Handle ABI breakage
    +# define PURPLE_MEDIA_NETWORK_PROTOCOL_TCP PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE
    +#endif
    #undef purple_notify_error
    #define purple_notify_error(handle, title, primary, secondary, cpar) \