# HG changeset patch
# User markus schnalke <meillo@marmaro.de>
# Date 1310636303 -7200
# Node ID b45dc53f2829a0954a9485ed2ec3f7e83f1ef6db
# Parent  a7a387253b2f5eaa55ad7b40f66734f43b40ad84
Removed unused second arg of msg_spool_read()

diff -r a7a387253b2f -r b45dc53f2829 src/masqmail.c
--- a/src/masqmail.c	Thu Jul 14 11:31:52 2011 +0200
+++ b/src/masqmail.c	Thu Jul 14 11:38:23 2011 +0200
@@ -343,7 +343,7 @@
 
 	/* non-privileged users may only delete their own messages */
 	for (; *id; id++) {
-		message *msg = msg_spool_read(*id, FALSE);
+		message *msg = msg_spool_read(*id);
 
 		fprintf(stderr, "id: %s\n", *id);
 
diff -r a7a387253b2f -r b45dc53f2829 src/masqmail.h
--- a/src/masqmail.h	Thu Jul 14 11:31:52 2011 +0200
+++ b/src/masqmail.h	Thu Jul 14 11:38:23 2011 +0200
@@ -450,7 +450,7 @@
 
 /* spool.c */
 gboolean spool_read_data(message * msg);
-message *msg_spool_read(gchar * uid, gboolean do_readdata);
+message *msg_spool_read(gchar * uid);
 gboolean spool_write(message * msg, gboolean do_writedata);
 gboolean spool_lock(gchar * uid);
 gboolean spool_unlock(gchar * uid);
diff -r a7a387253b2f -r b45dc53f2829 src/queue.c
--- a/src/queue.c	Thu Jul 14 11:31:52 2011 +0200
+++ b/src/queue.c	Thu Jul 14 11:38:23 2011 +0200
@@ -76,7 +76,7 @@
 
 		DEBUG(5) debugf("uid: %s\n", uid);
 
-		msg_list = g_list_append(msg_list, msg_spool_read(uid, FALSE));
+		msg_list = g_list_append(msg_list, msg_spool_read(uid));
 
 		DEBUG(5) debugf("after read spool file for %s\n", uid);
 
diff -r a7a387253b2f -r b45dc53f2829 src/spool.c
--- a/src/spool.c	Thu Jul 14 11:31:52 2011 +0200
+++ b/src/spool.c	Thu Jul 14 11:38:23 2011 +0200
@@ -201,7 +201,7 @@
 }
 
 message*
-msg_spool_read(gchar * uid, gboolean do_readdata)
+msg_spool_read(gchar * uid)
 {
 	message *msg;
 	gboolean ok = FALSE;
@@ -212,13 +212,7 @@
 	DEBUG(4) debugf("msg_spool_read():\n");
 	/* header spool: */
 	ok = spool_read_header(msg);
-	DEBUG(4) debugf("  spool_read_header() returned: %d (do_readdata had been: %d)\n",
-	                ok, do_readdata);
-	if (ok && do_readdata) {
-		/* data spool: */
-		ok = spool_read_data(msg);
-		DEBUG(4) debugf("  spool_read_data() returned: %d\n", ok);
-	}
+	DEBUG(4) debugf("  spool_read_header() returned: %d\n", ok);
 	return msg;
 }