Fix some compiler warnings.

	* mail-crypto.c, mail-format.c, message-thread.c: Fix some
	compiler warnings.

svn path=/trunk/; revision=4615

4 files changed, 9 insertions, 6 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index f91fcee4f5..1175d1a6de 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-08  Dan Winship  <danw@helixcode.com>
 
+	* mail-crypto.c, mail-format.c, message-thread.c: Fix some
+	compiler warnings.
+
 	* mail-format.c (mail_generate_reply): Fix up format of addresses.
 	(write_headers): Use CamelAddress functions to simplify this.
 
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 7f8c22af12..7314aaeffc 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -130,7 +130,6 @@ crypto_exec_with_passwd (char *path, char *argv[], const char *input,
         gboolean eof_seen, diag_eof_seen, passwd_eof_seen, input_eof_seen;
         size_t passwd_remaining, passwd_incr, input_remaining, input_incr;
 	struct timeval timeout;
-        long tmp;
 
 	if ((pipe (ip_fds) < 0 ) ||
 	    (pipe (op_fds) < 0 ) ||
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 1be527bad2..e90dc50826 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -430,6 +430,7 @@ static void
 write_headers (CamelMimeMessage *message, struct mail_format_data *mfd)
 {
 	const CamelInternetAddress *recipients;
+	const char *reply_to;
 	char *string;
 
 	mail_html_write (mfd->html, mfd->stream,
@@ -441,9 +442,9 @@ write_headers (CamelMimeMessage *message, struct mail_format_data *mfd)
 			       camel_mime_message_get_from (message),
 			       TRUE, mfd->html, mfd->stream);
 
-	string = camel_mime_message_get_reply_to (message);
-	if (string) {
-		write_field_to_stream ("Reply-To:", string, FALSE,
+	reply_to = camel_mime_message_get_reply_to (message);
+	if (reply_to) {
+		write_field_to_stream ("Reply-To:", reply_to, FALSE,
 				       mfd->html, mfd->stream);
 	}
 
diff --git a/mail/message-thread.c b/mail/message-thread.c
index c35e39f470..f199c27341 100644
--- a/mail/message-thread.c
+++ b/mail/message-thread.c
@@ -422,7 +422,7 @@ thread_messages(CamelFolder *folder, GPtrArray *uids)
 		mi = camel_folder_get_message_info (folder, uids->pdata[i]);
 
 		if (mi == NULL) {
-			g_warning("Folder doesn't contain uid %s", uids->pdata[i]);
+			g_warning("Folder doesn't contain uid %s", (char *)uids->pdata[i]);
 			continue;
 		}
 
@@ -436,7 +436,7 @@ thread_messages(CamelFolder *folder, GPtrArray *uids)
 		} else {
 			d(printf("doing : (no message id)\n"));
 			c = g_malloc0(sizeof(*c));
-			g_hash_table_insert(no_id_table, mi, c);
+			g_hash_table_insert(no_id_table, (void *)mi, c);
 		}
 
 		c->message = mi;