pidgin/pidgin

Merge with release-2.x.y

2014-11-05, Daniel Atallah
9ba4a2b8ecd1
Parents f784f0d12ffe0223e88d7858
Children 09478bc2e043
Merge with release-2.x.y
1 files changed, 2 insertions(+), 0 deletions(-)
  • +2 -0
    libpurple/plugins/ssl/nss-prefs.c
    • --- a/libpurple/plugins/ssl/nss-prefs.c Wed Nov 05 13:24:50 2014 -0500
    +++ b/libpurple/plugins/ssl/nss-prefs.c Wed Nov 05 14:02:06 2014 -0500
    @@ -340,9 +340,11 @@
    case SSL_LIBRARY_VERSION_TLS_1_2:
    ver = g_strdup(_("TLS 1.2"));
    break;
    +#ifdef SSL_LIBRARY_VERSION_TLS_1_3
    case SSL_LIBRARY_VERSION_TLS_1_3:
    ver = g_strdup(_("TLS 1.3"));
    break;
    +#endif
    default:
    ver = g_strdup_printf("0x%04hx", tmp_version);
    }