Lua improvements:

[apps/madmutt.git] / lib-ui / query.c

diff --git a/lib-ui/query.c b/lib-ui/query.c
index 99631bf..d1933f8 100644 (file)
--- a/lib-ui/query.c
+++ b/lib-ui/query.c
@@ -100,14 +100,14 @@ static QUERY *run_query (char *s, int quiet)
         cur = cur->next;
       }
 
-      l = mutt_strwidth (p);
+      l = m_strwidth(p);
       if (l > SecondColumn)
         SecondColumn = l;
 
       cur->addr = rfc822_parse_adrlist (cur->addr, p);
       p = strtok (NULL, "\t\n");
       if (p) {
-        l = mutt_strwidth (p);
+        l = m_strwidth(p);
         if (l > FirstColumn)
           FirstColumn = l;
         cur->name = m_strdup(p);
@@ -159,7 +159,7 @@ static int query_search (MUTTMENU * m, regex_t * re, int n)
 static void query_entry (char *s, ssize_t slen, MUTTMENU * m, int num)
 {
   ENTRY *table = (ENTRY *) m->data;
-  char buf2[SHORT_STRING], buf[SHORT_STRING] = "";
+  char buf2[STRING], buf[STRING] = "";
 
   /* need a query format ... hard coded constants are not good */
   while (FirstColumn + SecondColumn > 70) {
@@ -250,7 +250,7 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
   QUERY *queryp = NULL;
   int i, done = 0;
   int op;
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   char title[STRING];
 
   snprintf (title, sizeof (title), _("Query")); /* FIXME */