/pidgin/main: 3b264e3c6710: Merge with release-2.x.y
Daniel Atallah <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 3b264e3c6710945b0e2de494abe0ceb203ea6419 Author: Daniel Atallah <[email protected]> Date: 2014-11-07 14:17 -0500 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/3b264e3c6710 Description: Merge with release-2.x.y diffstat: libpurple/plugins/ssl/nss-prefs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (15 lines): diff --git a/libpurple/plugins/ssl/nss-prefs.c b/libpurple/plugins/ssl/nss-prefs.c --- a/libpurple/plugins/ssl/nss-prefs.c +++ b/libpurple/plugins/ssl/nss-prefs.c @@ -337,9 +337,11 @@ get_plugin_pref_frame(PurplePlugin *plug 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"));