changeset
Merge with release-2.x.y
Fri, 07 Nov 2014 14:17:07 -0500
- author
- Daniel Atallah <datallah@pidgin.im>
- date
- Fri, 07 Nov 2014 14:17:07 -0500
- changeset 36236
- 3b264e3c6710
- parent 36234
- 09478bc2e043 (current diff)
- parent 36235
- 6f5e35bda0c9 (diff)
- child 36237
- 47cc3f47592c
Merge with release-2.x.y
--- a/libpurple/plugins/ssl/nss-prefs.c Thu Nov 06 15:15:12 2014 +0100 +++ b/libpurple/plugins/ssl/nss-prefs.c Fri Nov 07 14:17:07 2014 -0500 @@ -337,9 +337,11 @@ case SSL_LIBRARY_VERSION_TLS_1_1: ver = g_strdup(_("TLS 1.1")); break; +#ifdef SSL_LIBRARY_VERSION_TLS_1_2 case SSL_LIBRARY_VERSION_TLS_1_2: ver = g_strdup(_("TLS 1.2")); break; +#endif #ifdef SSL_LIBRARY_VERSION_TLS_1_3 case SSL_LIBRARY_VERSION_TLS_1_3: ver = g_strdup(_("TLS 1.3"));
