Updating branch refs/heads/master
to bccd352d9f22217a8555a98e8c4147f7d53c3a72 (commit)
from 71deaf65a4d0f9f2a076690dd817050e2099a2b6 (commit)
commit bccd352d9f22217a8555a98e8c4147f7d53c3a72
Author: Ján Sučan <[email protected]>
Date: Sun Sep 1 23:23:48 2013 +0200
Remove deprecated gnutls function
Remove the gnutls_certificate_type_set_priority() use since x509 is the
default certificate type anyway.
libmailwatch-core/mailwatch-net-conn.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libmailwatch-core/mailwatch-net-conn.c
b/libmailwatch-core/mailwatch-net-conn.c
index 9e589a6..b7bbac2 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -600,10 +600,6 @@ gboolean
xfce_mailwatch_net_conn_make_secure(XfceMailwatchNetConn *net_conn,
GError **error)
{
-#ifdef HAVE_SSL_SUPPORT
- const int cert_type_prio[2] = { GNUTLS_CRT_X509, 0 };
-#endif
-
g_return_val_if_fail(net_conn && (!error || !*error), FALSE);
g_return_val_if_fail(net_conn->fd != -1, FALSE);
g_return_val_if_fail(!net_conn->is_secure, TRUE);
@@ -618,7 +614,6 @@ xfce_mailwatch_net_conn_make_secure(XfceMailwatchNetConn
*net_conn,
/* init the session and set it up */
gnutls_init(&net_conn->gt_session, GNUTLS_CLIENT);
gnutls_set_default_priority(net_conn->gt_session);
- gnutls_certificate_type_set_priority(net_conn->gt_session, cert_type_prio);
gnutls_credentials_set(net_conn->gt_session, GNUTLS_CRD_CERTIFICATE,
net_conn->gt_creds);
gnutls_transport_set_ptr(net_conn->gt_session,
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
