Implement ::get_file_desc() in CamelTcpStreamSSL

This lets us get rid of camel_tcp_stream_ssl_sockfd(), in favor
of camel_tcp_stream_get_file_desc().

Signed-off-by: Federico Mena Quintero <federico@novell.com>

diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 3fe56de..2a495a6 100644 (file)
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -1415,18 +1415,12 @@ tcp_stream_ssl_get_remote_address (CamelTcpStream *stream,
        return sockaddr_from_praddr(&addr, len);
 }
 
-/**
- * camel_tcp_stream_ssl_sockfd:
- * @stream: a #CamelTcpStreamSSL
- *
- * FIXME Document me!
- *
- * Since: 2.30
- **/
-PRFileDesc *
-camel_tcp_stream_ssl_sockfd (CamelTcpStreamSSL *stream)
+static PRFileDesc *
+tcp_stream_ssl_get_file_desc (CamelTcpStream *stream)
 {
-       return stream->priv->sockfd;
+       CamelTcpStreamSSL *ssl = CAMEL_TCP_STREAM_SSL (stream);
+
+       return ssl->priv->sockfd;
 }
 
 static void
@@ -1454,6 +1448,7 @@ camel_tcp_stream_ssl_class_init (CamelTcpStreamSSLClass *class)
        tcp_stream_class->setsockopt = tcp_stream_ssl_setsockopt;
        tcp_stream_class->get_local_address  = tcp_stream_ssl_get_local_address;
        tcp_stream_class->get_remote_address = tcp_stream_ssl_get_remote_address;
+       tcp_stream_class->get_file_desc = tcp_stream_ssl_get_file_desc;
 }
 
 static void

diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h
index 928f578..6e63579 100644 (file)
--- a/camel/camel-tcp-stream-ssl.h
+++ b/camel/camel-tcp-stream-ssl.h
@@ -81,8 +81,6 @@ CamelStream *camel_tcp_stream_ssl_new_raw (struct _CamelSession *session, const
 
 gint camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl);
 
-PRFileDesc * camel_tcp_stream_ssl_sockfd (CamelTcpStreamSSL *stream);
-
 G_END_DECLS
 
 #endif /* HAVE_SSL */

diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index fcd5af1..8bf9593 100644 (file)
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -4598,7 +4598,7 @@ imapx_parser_thread (gpointer d)
                        PRPollDesc pollfds[2] = { };
                        gint res;
 
-                       pollfds[0].fd = camel_tcp_stream_ssl_sockfd ((CamelTcpStreamSSL *)is->stream->source);
+                       pollfds[0].fd = camel_tcp_stream_get_file_desc (CAMEL_TCP_STREAM (is->stream->source));
                        pollfds[0].in_flags = PR_POLL_READ;
                        pollfds[1].fd = camel_operation_cancel_prfd (op);
                        pollfds[1].in_flags = PR_POLL_READ;