X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sort.c;h=e7581748359a20a9275fcfdd4c059338f3c53c23;hp=38e9d871ef0cd394741ff5d72fd3a924f5af7eb5;hb=d776c6c67b63e05bd052fcedf77e9147560e83af;hpb=d4321859bb9ce5b43fbd8303394cf98ae7720a38

diff --git a/sort.c b/sort.c
index 38e9d87..e758174 100644
--- a/sort.c
+++ b/sort.c
@@ -7,24 +7,14 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "sort.h"
 #include "thread.h"
 #include "mutt_idna.h"
 
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
 #define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x
 
 /* function to use as discriminator when normal sort method is equal */
@@ -90,11 +80,11 @@ int compare_subject (const void *a, const void *b)
 
 const char *mutt_get_name (address_t * a)
 {
-  address_t *ali;
+  const address_t *ali;
   const char *name = "";
 
   if (a) {
-    if (option (OPTREVALIAS) && (ali = alias_reverse_lookup(Aliases, a))
+    if (option (OPTREVALIAS) && (ali = alias_reverse_lookup(a))
         && ali->personal)
       name = ali->personal;
     else if (a->personal)