X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.cpkg;h=4530db9a5c7e1858f3cfe85b06c8235549ab40c1;hp=dc88306f062ef35c993f5a1ac410cfe3abd820cb;hb=6920eb5798f2d9f25e5ea1af2ba86122cf408bd1;hpb=dd5354f76c36f71044f6ddeee61241691c7195ff

diff --git a/alias.cpkg b/alias.cpkg
index dc88306..4530db9 100644
--- a/alias.cpkg
+++ b/alias.cpkg
@@ -29,8 +29,7 @@
 
 #include <lib-sys/unix.h>
 
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
 
 #include "alias.h"
@@ -607,7 +606,7 @@ alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
 
 static void alias_entry(char *s, ssize_t slen, MUTTMENU *m, int num)
 {
-    m_strformat(s, slen, COLS - SW, MAlias.alias_format, alias_format_str,
+    m_strformat(s, slen, getmaxx(main_w), MAlias.alias_format, alias_format_str,
                 ((alias_t **)m->data)[num], 0);
 }
 
@@ -627,7 +626,7 @@ static int alias_SortAlias (const void *a, const void *b)
   alias_t *pb = *(alias_t **) b;
   int r = m_strcasecmp(pa->name, pb->name);
 
-  return (RSORT (r));
+  return RSORT (r);
 }
 
 static int alias_SortAddress (const void *a, const void *b)
@@ -652,7 +651,7 @@ static int alias_SortAddress (const void *a, const void *b)
     r = -1;
   else
     r = ascii_strcasecmp (pa->mailbox, pb->mailbox);
-  return (RSORT (r));
+  return RSORT (r);
 }
 
 void mutt_alias_menu (char *buf, size_t buflen, alias_t * aliases)