move all the parameter related functions into the lib-mime.

[apps/madmutt.git] / lib-crypt / pgp.c

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index bb55885..1cbcc6f 100644 (file)
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -518,13 +518,13 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
 
   /* fix the content type */
 
 
   /* fix the content type */
 

-  mutt_set_parameter ("format", "fixed", &b->parameter);
+  parameter_setval(&b->parameter, "format", "fixed");

   if (enc)
   if (enc)

-    mutt_set_parameter ("x-action", "pgp-encrypted", &b->parameter);
+    parameter_setval(&b->parameter, "x-action", "pgp-encrypted");

   else if (sgn)
   else if (sgn)

-    mutt_set_parameter ("x-action", "pgp-signed", &b->parameter);
+    parameter_setval(&b->parameter, "x-action", "pgp-signed");

   else if (key)
   else if (key)

-    mutt_set_parameter ("x-action", "pgp-keys", &b->parameter);
+    parameter_setval(&b->parameter, "x-action", "pgp-keys");

 
   return 1;
 }
 
   return 1;
 }


@@ -1030,9 +1030,9 @@ BODY *pgp_sign_message (BODY * a)
   t->use_disp = 0;
   t->disposition = DISPINLINE;
 
   t->use_disp = 0;
   t->disposition = DISPINLINE;
 

-  mutt_generate_boundary (&t->parameter);
-  mutt_set_parameter ("protocol", "application/pgp-signature", &t->parameter);
-  mutt_set_parameter ("micalg", pgp_micalg (sigfile), &t->parameter);
+  parameter_set_boundary(&t->parameter);
+  parameter_setval(&t->parameter, "protocol", "application/pgp-signature");
+  parameter_setval(&t->parameter, "micalg", pgp_micalg (sigfile));

 
   t->parts = a;
   a = t;
 
   t->parts = a;
   a = t;


@@ -1276,8 +1276,8 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
   t->use_disp = 0;
   t->disposition = DISPINLINE;
 
   t->use_disp = 0;
   t->disposition = DISPINLINE;
 

-  mutt_generate_boundary (&t->parameter);
-  mutt_set_parameter ("protocol", "application/pgp-encrypted", &t->parameter);
+  parameter_set_boundary(&t->parameter);
+  parameter_setval(&t->parameter, "protocol", "application/pgp-encrypted");

 
   t->parts = mutt_new_body ();
   t->parts->type = TYPEAPPLICATION;
 
   t->parts = mutt_new_body ();
   t->parts->type = TYPEAPPLICATION;


@@ -1444,23 +1444,12 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
   b->type = TYPETEXT;
   b->subtype = m_strdup("plain");
 
   b->type = TYPETEXT;
   b->subtype = m_strdup("plain");
 

-  mutt_set_parameter ("x-action",
-                      flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
-                      &b->parameter);
-  mutt_set_parameter ("charset", send_charset, &b->parameter);
+  parameter_setval(&b->parameter, "x-action",
+                   flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed");
+  parameter_setval(&b->parameter, "charset", send_charset);

 
   b->filename = m_strdup(pgpoutfile);
 
 
   b->filename = m_strdup(pgpoutfile);
 

-#if 0
-  /* The following is intended to give a clue to some completely brain-dead 
-   * "mail environments" which are typically used by large corporations.
-   */
-
-  b->d_filename = m_strdup("msg.pgp");
-  b->use_disp = 1;
-
-#endif
-

   b->disposition = DISPINLINE;
   b->unlink = 1;
 
   b->disposition = DISPINLINE;
   b->unlink = 1;