X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_menu.h;h=41204a6a55f8488c18e759e2cd0423ea9382be81;hp=abbf11fdb9f4442da25034128c71584c22fd7aec;hb=f7f0722b06934cf83c08e60d805238478ada2699;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/mutt_menu.h b/mutt_menu.h
index abbf11f..41204a6 100644
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -1,27 +1,20 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
-
+#ifndef _MUTT_MENU_H
+#define _MUTT_MENU_H
 /*
  * This file is named mutt_menu.h so it doesn't collide with ncurses menu.h
  */
 
 #include "keymap.h"
-#include "mutt_regex.h"
+
+#include "lib/rx.h"
 
 #define REDRAW_INDEX		(1)
 #define REDRAW_MOTION		(1<<1)
@@ -57,7 +50,7 @@ typedef struct menu_t {
   char *keys;                   /* keys used in the prompt */
 
   /* callback to generate an index line for the requested element */
-  void (*make_entry) (char *, size_t, struct menu_t *, int);
+  void (*make_entry) (char *, ssize_t, struct menu_t *, int);
 
   /* how to search the menu */
   int (*search) (struct menu_t *, regex_t * re, int n);
@@ -108,3 +101,5 @@ int mutt_menuLoop (MUTTMENU *);
 /* used in both the index and pager index to make an entry. */
 void index_make_entry (char *, size_t, struct menu_t *, int);
 int index_color (int);
+
+#endif /* !_MUTT_MENU_H */