projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix missing <libintl.h> include
[apps/madmutt.git]
/
lib-ui
/
query.c
diff --git
a/lib-ui/query.c
b/lib-ui/query.c
index
d1933f8
..
a9415e4
100644
(file)
--- 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.
*/
* 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-sys/unix.h>
#include <lib-ui/menu.h>
-#include <lib-ui/curses.h>
#include "mutt.h"
#include "alias.h"
#include "mutt.h"
#include "alias.h"
@@
-31,16
+30,6
@@
typedef struct entry {
QUERY *data;
} 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;
/* Variables for outsizing output format */
static int FirstColumn;
static int SecondColumn;
@@
-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 ();
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);
}
}
/* 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)
}
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;
QUERY *queryp = NULL;
int i, done = 0;
int op;
- char helpstr[STRING];
char title[STRING];
snprintf (title, sizeof (title), _("Query")); /* FIXME */
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->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 */
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->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)
/* count the number of results */
for (queryp = results; queryp; queryp = queryp->next)