X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fquery.c;h=a9415e454d9f2931ab53be22d1911957fef09a74;hp=99631bff692d4d73392d92ff553b58a23037f1fc;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e

diff --git a/lib-ui/query.c b/lib-ui/query.c
index 99631bf..a9415e4 100644
--- a/lib-ui/query.c
+++ b/lib-ui/query.c
@@ -7,12 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
 
 #include <lib-sys/unix.h>
 
 #include <lib-ui/menu.h>
-#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "alias.h"
@@ -31,16 +30,6 @@ typedef struct entry {
   QUERY *data;
 } ENTRY;
 
-static struct mapping_t QueryHelp[] = {
-  {N_("Exit"), OP_EXIT},
-  {N_("Mail"), OP_MAIL},
-  {N_("New Query"), OP_QUERY},
-  {N_("Make Alias"), OP_CREATE_ALIAS},
-  {N_("Search"), OP_SEARCH},
-  {N_("Help"), OP_HELP},
-  {NULL, OP_NULL}
-};
-
 /* Variables for outsizing output format */
 static int FirstColumn;
 static int SecondColumn;
@@ -100,14 +89,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 +148,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) {
@@ -216,12 +205,12 @@ int mutt_query_complete (char *buf, ssize_t buflen)
       rfc822_addrcat(buf, buflen, tmpa, 0);
       address_list_wipe(&tmpa);
       mutt_clear_error ();
-      return (0);
+      return 0;
     }
     /* multiple results, choose from query menu */
     query_menu (buf, buflen, results, 1);
   }
-  return (0);
+  return 0;
 }
 
 void mutt_query_menu (char *buf, ssize_t buflen)
@@ -250,7 +239,6 @@ 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 title[STRING];
 
   snprintf (title, sizeof (title), _("Query")); /* FIXME */
@@ -261,8 +249,6 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
   menu->tag = query_tag;
   menu->menu = MENU_QUERY;
   menu->title = title;
-  menu->help =
-    mutt_compile_help (helpstr, sizeof (helpstr), MENU_QUERY, QueryHelp);
 
   if (results == NULL) {
     /* Prompt for Query */
@@ -325,9 +311,6 @@ static void query_menu (char *buf, ssize_t buflen, QUERY * results, int retbuf)
             menu->tag = query_tag;
             menu->menu = MENU_QUERY;
             menu->title = title;
-            menu->help =
-              mutt_compile_help (helpstr, sizeof (helpstr), MENU_QUERY,
-                                 QueryHelp);
 
             /* count the number of results */
             for (queryp = results; queryp; queryp = queryp->next)