/pidgin/main: 9ba4a2b8ecd1: Merge with release-2.x.y
Daniel Atallah <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 9ba4a2b8ecd1c15a28e0786d5d4423dc254df8b5 Author: Daniel Atallah <[email protected]> Date: 2014-11-05 14:02 -0500 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/9ba4a2b8ecd1 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 @@ -340,9 +340,11 @@ get_plugin_pref_frame(PurplePlugin *plug 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); }