more updates in the build system, gettext related.

[apps/madmutt.git] / state.c

diff --git a/state.c b/state.c
index 3dfdbfb..ca73d4a 100644 (file)
--- a/state.c
+++ b/state.c
@@ -31,14 +31,14 @@ static void state_prefix_put (const char *d, size_t dlen, STATE * s)
 void mutt_convert_to_state (iconv_t cd, char *bufi, size_t * l, STATE * s)
 {
   char bufo[BUFO_SIZE];
-  ICONV_CONST char *ib;
+  const char *ib;
   char *ob;
   size_t ibl, obl;
 
   if (!bufi) {
     if (cd != (iconv_t) (-1)) {
       ob = bufo, obl = sizeof (bufo);
-      iconv (cd, 0, 0, &ob, &obl);
+      my_iconv(cd, 0, 0, &ob, &obl);
       if (ob != bufo)
         state_prefix_put (bufo, ob - bufo, s);
     }
@@ -90,9 +90,8 @@ void state_prefix_putc (char c, STATE * s)
       if (!option (OPTQUOTEEMPTY) && Quotebuf[offset] == '\n') {
         buf[0] = '\n';
         buf[1] = '\0';
-      } else if (option (OPTTEXTFLOWED))
-        rfc3676_quote_line (s, buf, sizeof (buf), Quotebuf);
-      else if (option (OPTQUOTEQUOTED) && offset) {
+      }
+      else if (!option (OPTTEXTFLOWED) && option (OPTQUOTEQUOTED) && offset) {
         for (i = 0; i < offset; i++)
           if (Quotebuf[i] != ' ')
             j = i;