Inline mail_crypto_get_pgp_cipher_context() logic into the composer

and kill mail/mail-crypto.[ch].

svn path=/branches/kill-bonobo/; revision=37273

3 files changed, 0 insertions, 97 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index 2f1e2d8446..b7b2a1d48a 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -151,8 +151,6 @@ libevolution_module_mail_la_SOURCES =			\
 	mail-autofilter.h				\
 	mail-config.c					\
 	mail-config.h					\
-	mail-crypto.c					\
-	mail-crypto.h					\
 	mail-folder-cache.c				\
 	mail-folder-cache.h				\
 	mail-mt.c					\
@@ -290,8 +288,6 @@ libevolution_module_mail_la_LIBADD =			\
 #	mail-component-factory.c		\
 #	mail-component.c			\
 #	mail-config.c				\
-#	mail-crypto.c				\
-#	mail-crypto.h				\
 #	mail-folder-cache.c			\
 #	mail-folder-cache.h			\
 #	mail-mt.c				\
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
deleted file mode 100644
index d7350eaa2a..0000000000
--- a/mail/mail-crypto.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Authors:
- *		Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <camel/camel-gpg-context.h>
-#include <libedataserver/e-account.h>
-
-#include "mail-crypto.h"
-#include "mail-session.h"
-
-/**
- * mail_crypto_get_pgp_cipher_context:
- * @account: Account that will be using this context
- *
- * Constructs a new GnuPG cipher context with the appropriate
- * options set based on the account provided.
- **/
-CamelCipherContext *
-mail_crypto_get_pgp_cipher_context (EAccount *account)
-{
-	CamelCipherContext *cipher;
-
-	cipher = camel_gpg_context_new (session);
-	if (account)
-		camel_gpg_context_set_always_trust ((CamelGpgContext *) cipher, account->pgp_always_trust);
-
-	return cipher;
-}
diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
deleted file mode 100644
index dbe1e6f86b..0000000000
--- a/mail/mail-crypto.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Authors:
- *		Jeffrey Stedfast <fejj@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef MAIL_CRYPTO_H
-#define MAIL_CRYPTO_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus  */
-
-struct _EAccount;
-
-/* PGP/MIME convenience wrappers */
-struct _CamelCipherContext *mail_crypto_get_pgp_cipher_context(struct _EAccount *account);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_CRYPTO_H */