changeset
Merge with release-2.x.y
Wed, 05 Nov 2014 14:02:06 -0500
- author
- Daniel Atallah <datallah@pidgin.im>
- date
- Wed, 05 Nov 2014 14:02:06 -0500
- changeset 36232
- 9ba4a2b8ecd1
- parent 36230
- f784f0d12ffe (current diff)
- parent 36231
- 0223e88d7858 (diff)
- child 36234
- 09478bc2e043
Merge with release-2.x.y
--- 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); }
