X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=state.c;h=12edf412a97ed229c6197e0687f16db2a7e805bf;hb=07066d3ea19865d08c4a8fd98b5e87eeace810da;hp=eb0a9c70000c583b7c41bf188ddcb2deb286b583;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd;p=apps%2Fmadmutt.git

diff --git a/state.c b/state.c
index eb0a9c7..12edf41 100644
--- a/state.c
+++ b/state.c
@@ -33,7 +33,7 @@ void mutt_convert_to_state (iconv_t cd, char *bufi, ssize_t * l, STATE * s)
   if (!bufi) {
     if (cd != MUTT_ICONV_ERROR) {
       ob = bufo, obl = sizeof (bufo);
-      my_iconv(cd, 0, 0, &ob, &obl);
+      mutt_iconv(cd, 0, 0, &ob, &obl);
       if (ob != bufo)
         state_prefix_put (bufo, ob - bufo, s);
     }
@@ -51,7 +51,7 @@ void mutt_convert_to_state (iconv_t cd, char *bufi, ssize_t * l, STATE * s)
   ib = bufi, ibl = *l;
   for (;;) {
     ob = bufo, obl = sizeof (bufo);
-    mutt_iconv (cd, &ib, &ibl, &ob, &obl, 0, "?");
+    mutt_iconv (cd, &ib, &ibl, &ob, &obl);
     if (ob == bufo)
       break;
     state_prefix_put (bufo, ob - bufo, s);
@@ -69,7 +69,7 @@ void state_prefix_putc (char c, STATE * s)
     Quotebuf[i++] = c;
     Quotebuf[i] = '\0';
     if (i == sizeof (Quotebuf) - 1 || c == '\n') {
-      char buf[2 * SHORT_STRING];
+      char buf[2 * STRING];
       int j = 0, offset = 0;
       regmatch_t pmatch[1];
 
@@ -119,7 +119,7 @@ int state_printf (STATE * s, const char *fmt, ...)
 
 void state_mark_attach (STATE * s)
 {
-  if ((s->flags & M_DISPLAY) && !m_strcmp(Pager, "builtin"))
+  if (s->flags & M_DISPLAY)
     state_puts (AttachmentMarker, s);
 }