devel/check-out-of-tree-build.sh: consistent naming, consistent quoting

[notmuch] / gmime-filter-reply.c

diff --git a/gmime-filter-reply.c b/gmime-filter-reply.c
index 3e298e1b647d4bf34ed91c6d033b6914f67fc50b..847426bfe663c29695182eb5c365ac7cae831a88 100644 (file)
--- a/gmime-filter-reply.c
+++ b/gmime-filter-reply.c
@@ -130,8 +130,9 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
                                reply->saw_nl = TRUE;
                        else
                                reply->saw_nl = FALSE;
-
-                       *outptr++ = *inptr++;
+                       if (*inptr != '\r')
+                               *outptr++ = *inptr;
+                       inptr++;
                }
        } else {
                g_mime_filter_set_size (filter, inlen + 1, FALSE);
@@ -150,7 +151,7 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
                                else
                                        *outptr++ = *inptr;
                                reply->saw_angle = FALSE;
-                       } else {
+                       } else if (*inptr != '\r') {
                                if (*inptr == '\n')
                                        reply->saw_nl = TRUE;
                                *outptr++ = *inptr;
@@ -200,7 +201,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;