projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sort out some prototypes, put them where they belong.
[apps/madmutt.git]
/
lib-crypt
/
crypt-gpgme.c
diff --git
a/lib-crypt/crypt-gpgme.c
b/lib-crypt/crypt-gpgme.c
index
3afaea0
..
e6ad538
100644
(file)
--- a/
lib-crypt/crypt-gpgme.c
+++ b/
lib-crypt/crypt-gpgme.c
@@
-41,11
+41,7
@@
#include <gpgme.h>
#include <gpgme.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
@@
-758,7
+754,7
@@
static BODY *sign_message (BODY * a, int use_smime)
return NULL;
}
return NULL;
}
- t =
mutt_new_body
();
+ t =
body_new
();
t->type = TYPEMULTIPART;
t->subtype = m_strdup("signed");
t->encoding = ENC7BIT;
t->type = TYPEMULTIPART;
t->subtype = m_strdup("signed");
t->encoding = ENC7BIT;
@@
-780,7
+776,7
@@
static BODY *sign_message (BODY * a, int use_smime)
t->parts = a;
a = t;
t->parts = a;
a = t;
- t->parts->next =
mutt_new_body
();
+ t->parts->next =
body_new
();
t = t->parts->next;
t->type = TYPEAPPLICATION;
if (use_smime) {
t = t->parts->next;
t->type = TYPEAPPLICATION;
if (use_smime) {
@@
-845,7
+841,7
@@
BODY *pgp_gpgme_encrypt_message (BODY * a, char *keylist, int sign)
if (!outfile)
return NULL;
if (!outfile)
return NULL;
- t =
mutt_new_body
();
+ t =
body_new
();
t->type = TYPEMULTIPART;
t->subtype = m_strdup("encrypted");
t->encoding = ENC7BIT;
t->type = TYPEMULTIPART;
t->subtype = m_strdup("encrypted");
t->encoding = ENC7BIT;
@@
-855,12
+851,12
@@
BODY *pgp_gpgme_encrypt_message (BODY * a, char *keylist, int sign)
parameter_set_boundary(&t->parameter);
parameter_setval(&t->parameter, "protocol", "application/pgp-encrypted");
parameter_set_boundary(&t->parameter);
parameter_setval(&t->parameter, "protocol", "application/pgp-encrypted");
- t->parts =
mutt_new_body
();
+ t->parts =
body_new
();
t->parts->type = TYPEAPPLICATION;
t->parts->subtype = m_strdup("pgp-encrypted");
t->parts->encoding = ENC7BIT;
t->parts->type = TYPEAPPLICATION;
t->parts->subtype = m_strdup("pgp-encrypted");
t->parts->encoding = ENC7BIT;
- t->parts->next =
mutt_new_body
();
+ t->parts->next =
body_new
();
t->parts->next->type = TYPEAPPLICATION;
t->parts->next->subtype = m_strdup("octet-stream");
t->parts->next->encoding = ENC7BIT;
t->parts->next->type = TYPEAPPLICATION;
t->parts->next->subtype = m_strdup("octet-stream");
t->parts->next->encoding = ENC7BIT;
@@
-903,7
+899,7
@@
BODY *smime_gpgme_build_smime_entity (BODY * a, char *keylist)
if (!outfile)
return NULL;
if (!outfile)
return NULL;
- t =
mutt_new_body
();
+ t =
body_new
();
t->type = TYPEAPPLICATION;
t->subtype = m_strdup("pkcs7-mime");
parameter_setval(&t->parameter, "name", "smime.p7m");
t->type = TYPEAPPLICATION;
t->subtype = m_strdup("pkcs7-mime");
parameter_setval(&t->parameter, "name", "smime.p7m");
@@
-1618,7
+1614,7
@@
int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
bb->offset = saved_b_offset;
fclose (tmpfp);
rewind (*fpout);
bb->offset = saved_b_offset;
fclose (tmpfp);
rewind (*fpout);
-
mutt_free_body
(cur);
+
body_list_wipe
(cur);
*cur = tmp_b;
}
return *cur ? 0 : -1;
*cur = tmp_b;
}
return *cur ? 0 : -1;
@@
-2056,7
+2052,7
@@
int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
: _("[-- End of PGP/MIME encrypted data --]\n"), s);
}
: _("[-- End of PGP/MIME encrypted data --]\n"), s);
}
-
mutt_free_body
(&tattach);
+
body_list_wipe
(&tattach);
}
fclose (fpout);
}
fclose (fpout);
@@
-2120,7
+2116,7
@@
int smime_gpgme_application_handler (BODY * a, STATE * s)
_("[-- End of S/MIME encrypted data --]\n"), s);
}
_("[-- End of S/MIME encrypted data --]\n"), s);
}
-
mutt_free_body
(&tattach);
+
body_list_wipe
(&tattach);
}
fclose (fpout);
}
fclose (fpout);
@@
-3673,7
+3669,7
@@
static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
if (fqdn)
rfc822_qualify (tmp, fqdn);
if (fqdn)
rfc822_qualify (tmp, fqdn);
-
tmp = mutt_remove_duplicates
(tmp);
+
address_list_uniq
(tmp);
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];