X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sort.c;h=979882358a8ca222e82a26ad881ee2319594e5f2;hp=38e9d871ef0cd394741ff5d72fd3a924f5af7eb5;hb=529d980f183269a45ba925b4f9ee688b01ad3b22;hpb=d4321859bb9ce5b43fbd8303394cf98ae7720a38 diff --git a/sort.c b/sort.c index 38e9d87..9798823 100644 --- a/sort.c +++ b/sort.c @@ -11,20 +11,20 @@ # include "config.h" #endif +#include +#include +#include +#include + #include #include #include "mutt.h" +#include "alias.h" #include "sort.h" #include "thread.h" #include "mutt_idna.h" - -#include -#include -#include -#include - #define SORTCODE(x) (Sort & SORT_REVERSE) ? -(x) : x /* function to use as discriminator when normal sort method is equal */ @@ -90,11 +90,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)