X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=gmime-filter-reply.c;h=f673c0a27385803a684540b6ce0078ad453f6f92;hp=b269db4e821265a065989a9b00c5f714c6b96c43;hb=f32e52448b8665dbf335fd97a21b49108e05a6c0;hpb=469d786c2548b0bcd711e79726c488094ffde583

diff --git a/gmime-filter-reply.c b/gmime-filter-reply.c
index b269db4e..f673c0a2 100644
--- a/gmime-filter-reply.c
+++ b/gmime-filter-reply.c
@@ -16,6 +16,8 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#include <stdbool.h>
+
 #include "gmime-filter-reply.h"
 
 /**
@@ -87,8 +89,8 @@ static void
 g_mime_filter_reply_init (GMimeFilterReply *filter, GMimeFilterReplyClass *klass)
 {
 	(void) klass;
-	filter->saw_nl = TRUE;
-	filter->saw_angle = FALSE;
+	filter->saw_nl = true;
+	filter->saw_angle = false;
 }
 
 static void
@@ -111,49 +113,49 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
 	       char **outbuf, size_t *outlen, size_t *outprespace)
 {
 	GMimeFilterReply *reply = (GMimeFilterReply *) filter;
-	register const char *inptr = inbuf;
+	const char *inptr = inbuf;
 	const char *inend = inbuf + inlen;
 	char *outptr;
 
 	(void) prespace;
 	if (reply->encode) {
-		g_mime_filter_set_size (filter, 3 * inlen, FALSE);
+		g_mime_filter_set_size (filter, 3 * inlen, false);
 
 		outptr = filter->outbuf;
 		while (inptr < inend) {
 			if (reply->saw_nl) {
 				*outptr++ = '>';
 				*outptr++ = ' ';
-				reply->saw_nl = FALSE;
+				reply->saw_nl = false;
 			}
 			if (*inptr == '\n')
-				reply->saw_nl = TRUE;
+				reply->saw_nl = true;
 			else
-				reply->saw_nl = FALSE;
+				reply->saw_nl = false;
 			if (*inptr != '\r')
 				*outptr++ = *inptr;
 			inptr++;
 		}
 	} else {
-		g_mime_filter_set_size (filter, inlen + 1, FALSE);
+		g_mime_filter_set_size (filter, inlen + 1, false);
 
 		outptr = filter->outbuf;
 		while (inptr < inend) {
 			if (reply->saw_nl) {
 				if (*inptr == '>')
-					reply->saw_angle = TRUE;
+					reply->saw_angle = true;
 				else
 					*outptr++ = *inptr;
-				reply->saw_nl = FALSE;
+				reply->saw_nl = false;
 			} else if (reply->saw_angle) {
 				if (*inptr == ' ')
 					;
 				else
 					*outptr++ = *inptr;
-				reply->saw_angle = FALSE;
+				reply->saw_angle = false;
 			} else if (*inptr != '\r') {
 				if (*inptr == '\n')
-					reply->saw_nl = TRUE;
+					reply->saw_nl = true;
 				*outptr++ = *inptr;
 			}
 
@@ -179,19 +181,19 @@ filter_reset (GMimeFilter *filter)
 {
 	GMimeFilterReply *reply = (GMimeFilterReply *) filter;
 
-	reply->saw_nl = TRUE;
-	reply->saw_angle = FALSE;
+	reply->saw_nl = true;
+	reply->saw_angle = false;
 }
 
 
 /**
  * g_mime_filter_reply_new:
- * @encode: %TRUE if the filter should encode or %FALSE otherwise
+ * @encode: %true if the filter should encode or %false otherwise
  * @dots: encode/decode dots (as for SMTP)
  *
  * Creates a new #GMimeFilterReply filter.
  *
- * If @encode is %TRUE, then all lines will be prefixed by "> ",
+ * If @encode is %true, then all lines will be prefixed by "> ",
  * otherwise any lines starting with "> " will have that removed
  *
  * Returns: a new #GMimeFilterReply filter.
@@ -201,7 +203,7 @@ g_mime_filter_reply_new (gboolean encode)
 {
 	GMimeFilterReply *new_reply;
 
-	new_reply = (GMimeFilterReply *) g_object_newv (GMIME_TYPE_FILTER_REPLY, 0, NULL);
+	new_reply = (GMimeFilterReply *) g_object_new (GMIME_TYPE_FILTER_REPLY, NULL);
 	new_reply->encode = encode;
 
 	return (GMimeFilter *) new_reply;