[evolution-data-server] Bug 595351 - Drop OpenSSL support in Camel
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Bug 595351 - Drop OpenSSL support in Camel
- Date: Wed, 23 Sep 2009 15:57:16 +0000 (UTC)
commit 2fd44a5c68190d985969da9f7b2ddcc8f097ccc1
Author: H.Habighorst <tearofadragon googlemail com>
Date: Wed Sep 23 11:56:36 2009 -0400
Bug 595351 - Drop OpenSSL support in Camel
camel/Makefile.am | 1 -
camel/camel-tcp-stream-openssl.c | 950 ---------------------------
camel/camel-tcp-stream-ssl.c | 5 +-
camel/camel-types.h | 1 -
docs/reference/camel/tmpl/camel-types.sgml | 6 -
docs/reference/camel/tmpl/camel-unused.sgml | 6 -
po/POTFILES.in | 1 -
7 files changed, 1 insertions(+), 969 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 8d3123d..5115d0e 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -78,7 +78,6 @@ libcamel_provider_1_2_la_SOURCES = \
camel-smime-context.c \
camel-store-summary.c \
camel-store.c \
- camel-tcp-stream-openssl.c \
camel-tcp-stream-raw.c \
camel-tcp-stream-ssl.c \
camel-tcp-stream.c \
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 339812f..7677177 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -21,10 +21,7 @@
*/
/* NOTE: This is the default implementation of CamelTcpStreamSSL,
- * used when the Mozilla NSS libraries are used. If you configured
- * OpenSSL support instead, then this file won't be compiled and
- * the CamelTcpStreamSSL implementation in camel-tcp-stream-openssl.c
- * will be used instead.
+ * used when the Mozilla NSS libraries are used.
*/
#ifdef HAVE_CONFIG_H
diff --git a/camel/camel-types.h b/camel/camel-types.h
index bcf5221..afa3b95 100644
--- a/camel/camel-types.h
+++ b/camel/camel-types.h
@@ -70,7 +70,6 @@ typedef struct _CamelStreamMem CamelStreamMem;
typedef struct _CamelTcpStream CamelTcpStream;
typedef struct _CamelTcpStreamRaw CamelTcpStreamRaw;
typedef struct _CamelTcpStreamSSL CamelTcpStreamSSL;
-typedef struct _CamelTcpStreamOpenSSL CamelTcpStreamOpenSSL;
typedef struct _CamelHttpStream CamelHttpStream;
typedef struct _CamelTransport CamelTransport;
diff --git a/docs/reference/camel/tmpl/camel-types.sgml b/docs/reference/camel/tmpl/camel-types.sgml
index c9c505d..c3aed2c 100644
--- a/docs/reference/camel/tmpl/camel-types.sgml
+++ b/docs/reference/camel/tmpl/camel-types.sgml
@@ -325,12 +325,6 @@ camel-types
</para>
-<!-- ##### STRUCT CamelTcpStreamOpenSSL ##### -->
-<para>
-
-</para>
-
-
<!-- ##### STRUCT CamelHttpStream ##### -->
<para>
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index 51b8ea4..cfa6b68 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -423,12 +423,6 @@ camel-types
</para>
-<!-- ##### STRUCT CamelTcpStreamOpenSSL ##### -->
-<para>
-
-</para>
-
-
<!-- ##### MACRO NI_MAXHOST ##### -->
<para>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f0fd742..03efca6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -120,7 +120,6 @@ camel/camel-stream-null.c
camel/camel-stream-process.c
camel/camel-stream.c
camel/camel-string-utils.c
-camel/camel-tcp-stream-openssl.c
camel/camel-tcp-stream-raw.c
camel/camel-tcp-stream-ssl.c
camel/camel-tcp-stream.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]