remove cryptglue.c

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-crypt/Makefile.am b/lib-crypt/Makefile.am
index 87c3c1e..5e591e6 100644 (file)
--- a/lib-crypt/Makefile.am
+++ b/lib-crypt/Makefile.am
@@ -1,8 +1,7 @@
 noinst_LIBRARIES = libcrypt.a
 
 noinst_LIBRARIES = libcrypt.a
 

-libcrypt_a_SOURCES = crypt.h \
-                    crypt.c crypt-gpgme.c cryptglue.c
+libcrypt_a_SOURCES = crypt.h crypt.c crypt-gpgme.c

 
 

-noinst_HEADERS     =  crypt.h
+noinst_HEADERS     = crypt.h

 
 -include $(top_builddir)/tools/cflags.mk
 
 -include $(top_builddir)/tools/cflags.mk

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index caba821..aac1f10 100644 (file)
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -494,7 +494,6 @@ gpgme_get_key2 (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
 {
   gpgme_ctx_t listctx;
   gpgme_error_t err;
 {
   gpgme_ctx_t listctx;
   gpgme_error_t err;

-  gpgme_key_t key;

 
   if (!ctx || !r_key || !fpr)
     return gpg_error (GPG_ERR_INV_VALUE);
 
   if (!ctx || !r_key || !fpr)
     return gpg_error (GPG_ERR_INV_VALUE);


@@ -3948,3 +3947,24 @@ void crypt_pgp_extract_keys_from_attachment_list(FILE * fp, int tag, BODY * top)
   unset_option (OPTDONTHANDLEPGPKEYS);
 }
 
   unset_option (OPTDONTHANDLEPGPKEYS);
 }
 

+
+/* TODO */
+
+/* fixme: needs documentation. */
+void crypt_pgp_invoke_getkeys (address_t * addr)
+{
+}
+
+/* Generate a PGP public key attachment. */
+BODY *crypt_pgp_make_key_attachment (char *tempf)
+{
+    return NULL;
+}
+
+/* S/MIME */
+
+/* fixme: Needs documentation. */
+void crypt_smime_getkeys (ENVELOPE * env)
+{
+}
+

diff --git a/lib-crypt/cryptglue.c b/lib-crypt/cryptglue.c
deleted file mode 100644 (file)
index e349698..0000000
--- a/lib-crypt/cryptglue.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright notice from original mutt:
- * Copyright (C) 2003  Werner Koch <wk@gnupg.org>
- * Copyright (C) 2004 g10 Code GmbH
- *
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
- */
-
-/*
-   This file dispatches the generic crypto functions to the
-   implemented backend or provides dummy stubs.  Note, that some
-   generic functions are handled in crypt.c.
-*/
-
-/* Note: This file has been changed to make use of the new module
-   system.  Consequently there's a 1:1 mapping between the functions
-   contained in this file and the functions implemented by the crypto
-   modules.  */
-
-#include <lib-lib/lib-lib.h>
-
-#include "mutt.h"
-#include "crypt.h"
-
-/* PGP */
-
-/* fixme: needs documentation. */
-void crypt_pgp_invoke_getkeys (address_t * addr)
-{
-}
-
-/* Generate a PGP public key attachment. */
-BODY *crypt_pgp_make_key_attachment (char *tempf)
-{
-    return NULL;
-}
-
-/* S/MIME */
-
-/* fixme: Needs documentation. */
-void crypt_smime_getkeys (ENVELOPE * env)
-{
-}
-