pidgin/pidgin

Merge with release-2.x.y

2014-11-07, Daniel Atallah
3b264e3c6710
Parents 09478bc2e0436f5e35bda0c9
Children 47cc3f47592c
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 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"));