aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/openpgp-utils.c9
2 files changed, 10 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9f62c34d31..32f23c2b08 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2001-04-11 Jeffrey Stedfast <fejj@ximian.com>
+ * openpgp-utils.c (openpgp_encrypt): Don't g_free the recipient
+ array members here because we free them in the caller.
+
+2001-04-11 Jeffrey Stedfast <fejj@ximian.com>
+
* mail-crypto.c (pgp_mime_part_verify): Huh, somehow I forgot to
apply the from filter when verifying signed parts. Oh well,
probably not all that common. Fixed now though.
@@ -188,8 +193,8 @@
2001-04-02 Iain Holmes <iain@ximian.com>
- * importers/elm-importer.c (elm_can_import): Calls is_kmail to check for
- kmail files.
+ * importers/elm-importer.c (elm_can_import): Calls is_kmail to
+ check for kmail files.
(is_kmail): Checks if the given directory is a KMail directory.
2001-04-02 Dan Winship <danw@ximian.com>
diff --git a/mail/openpgp-utils.c b/mail/openpgp-utils.c
index 1377793b6a..96d92cb84d 100644
--- a/mail/openpgp-utils.c
+++ b/mail/openpgp-utils.c
@@ -431,12 +431,12 @@ crypto_exec_with_passwd (const char *path, char *argv[], const char *input, int
* openpgp_decrypt:
* @ciphertext: ciphertext to decrypt
* @cipherlen: ciphertext length
- * @outlen: output length of the decrypted data (to be set by #openpgp_decrypt)
+ * @outlen: output length of the decrypted data (to be set by @openpgp_decrypt)
* @ex: exception
*
* Returns an allocated buffer containing the decrypted ciphertext. If
* the cleartext is plain text then you may treat it like a normal
- * string as it will be NUL terminated, however #outlen is also set in
+ * string as it will be NUL terminated, however @outlen is also set in
* the case that the cleartext is a binary stream.
**/
gchar *
@@ -539,7 +539,7 @@ openpgp_decrypt (const gchar *ciphertext, gint cipherlen, gint *outlen, CamelExc
* @inlen: input length of input data
* @recipients: An array of recipient ids
* @sign: TRUE if you want to sign as well as encrypt
- * @userid: userid to use when signing (assuming #sign is TRUE)
+ * @userid: userid to use when signing (assuming @sign is TRUE)
* @ex: exception
*
* Returns an allocated string containing the ciphertext.
@@ -610,7 +610,6 @@ openpgp_encrypt (const gchar *in, gint inlen, const GPtrArray *recipients,
recipient = recipients->pdata[r];
buf = g_strdup_printf ("-r %s", recipient);
g_ptr_array_add (recipient_list, buf);
- g_free (recipient);
}
g_ptr_array_add (argv, "gpg");
@@ -648,7 +647,6 @@ openpgp_encrypt (const gchar *in, gint inlen, const GPtrArray *recipients,
recipient = recipients->pdata[r];
buf = g_strdup_printf ("-r %s", recipient);
g_ptr_array_add (recipient_list, buf);
- g_free (recipient);
}
g_ptr_array_add (argv, "pgpe");
@@ -679,7 +677,6 @@ openpgp_encrypt (const gchar *in, gint inlen, const GPtrArray *recipients,
recipient = recipients->pdata[r];
buf = g_strdup (recipient);
g_ptr_array_add (recipient_list, buf);
- g_free (recipient);
}
g_ptr_array_add (argv, "pgp");