X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=state.c;h=656f816235f7a4136628942ae7189ef6b16939a9;hp=3e106191132bbb2ea59ba3d8ad7aa294245616ea;hb=89a7d4396b35e8047cbe519e81e22d99a1efd018;hpb=59926571aaec3e38cec09d0d9fa34f4a4b887309

diff --git a/state.c b/state.c
index 3e10619..656f816 100644
--- a/state.c
+++ b/state.c
@@ -38,7 +38,7 @@ void mutt_convert_to_state (iconv_t cd, char *bufi, size_t * l, STATE * s)
   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);
     }
@@ -70,7 +70,7 @@ void state_prefix_putc (char c, STATE * s)
   if (s->flags & M_PENDINGPREFIX) {
     int i;
 
-    i = str_len (Quotebuf);
+    i = m_strlen(Quotebuf);
     Quotebuf[i++] = c;
     Quotebuf[i] = '\0';
     if (i == sizeof (Quotebuf) - 1 || c == '\n') {
@@ -102,11 +102,11 @@ void state_prefix_putc (char c, STATE * s)
         snprintf (buf, sizeof (buf), "%s%s", NONULL (s->prefix), Quotebuf);
 
 #ifdef DEBUG
-      if (str_len (buf) >= 2) {
-        save = buf[str_len (buf) - 1];
-        buf[str_len (buf) - 1] = '\0';
+      if (m_strlen(buf) >= 2) {
+        save = buf[m_strlen(buf) - 1];
+        buf[m_strlen(buf) - 1] = '\0';
         debug_print (2, ("buf = '%s'\n", buf));
-        buf[str_len (buf)] = save;
+        buf[m_strlen(buf)] = save;
       }
 #endif
 
@@ -136,7 +136,7 @@ int state_printf (STATE * s, const char *fmt, ...)
 
 void state_mark_attach (STATE * s)
 {
-  if ((s->flags & M_DISPLAY) && !str_cmp (Pager, "builtin"))
+  if ((s->flags & M_DISPLAY) && !m_strcmp(Pager, "builtin"))
     state_puts (AttachmentMarker, s);
 }