further pop_mx_ng work

[apps/madmutt.git] / sort.h

diff --git a/sort.h b/sort.h
index 108e440..d4f9241 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -1,21 +1,15 @@
 /*
+ * 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_SORT_H
+#define MUTT_SORT_H
+
 #define SORT_DATE      1       /* the date the mail was sent. */
 #define SORT_SIZE      2
 #define SORT_SUBJECT   3
@@ -40,11 +34,8 @@
 typedef int sort_t (const void *, const void *);
 sort_t *mutt_get_sort_func (int);
 
-void mutt_clear_threads (CONTEXT *);
 void mutt_sort_headers (CONTEXT *, int);
-void mutt_sort_threads (CONTEXT *, int);
 int mutt_select_sort (int);
-THREAD *mutt_sort_subthreads (THREAD *, int);
 
 WHERE short BrowserSort INITVAL (SORT_SUBJECT);
 WHERE short Sort INITVAL (SORT_DATE);
@@ -54,5 +45,6 @@ WHERE short SortAlias INITVAL (SORT_ALIAS);
 /* FIXME: This one does not belong to here */
 WHERE short PgpSortKeys INITVAL (SORT_ADDRESS);
 
-#include "mapping.h"
 extern const struct mapping_t SortMethods[];
+
+#endif