Rename NOTMUCH_DATABASE_MODE_WRITABLE to NOTMUCH_DATABASE_MODE_READ_WRITE

[notmuch] / gmime-filter-reply.c

diff --git a/gmime-filter-reply.c b/gmime-filter-reply.c
index 3e298e1b647d4bf34ed91c6d033b6914f67fc50b..b269db4e821265a065989a9b00c5f714c6b96c43 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;
                                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);
                }
        } 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
                                        *outptr++ = *inptr;
                                reply->saw_angle = FALSE;

-                       } else {
+                       } else if (*inptr != '\r') {

                                if (*inptr == '\n')
                                        reply->saw_nl = TRUE;
                                *outptr++ = *inptr;
                                if (*inptr == '\n')
                                        reply->saw_nl = TRUE;
                                *outptr++ = *inptr;