Fix compilation warnings in compose.c and init.c

[apps/madmutt.git] / buffy.c

diff --git a/buffy.c b/buffy.c
index 105e809..fa531aa 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -18,6 +18,8 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include <imap/imap.h>
 
 #include "mutt.h"
@@ -26,7 +28,6 @@
 #include "mh.h"
 #include "sidebar.h"
 
-#include "mutt_curses.h"
 
 #include <string.h>
 #include <sys/stat.h>
@@ -100,13 +101,13 @@ static int test_last_status_new (FILE * f)
   if (fseeko_last_message (f) == -1)
     return (0);
 
-  hdr = mutt_new_header ();
+  hdr = header_new();
   tmp_envelope = mutt_read_rfc822_header (f, hdr, 0, 0);
   if (!(hdr->read || hdr->old))
     result = 1;
 
-  mutt_free_envelope (&tmp_envelope);
-  mutt_free_header (&hdr);
+  envelope_delete(&tmp_envelope);
+  header_delete(&hdr);
 
   return result;
 }
@@ -171,7 +172,7 @@ static void buffy_free (BUFFY** p) {
 }
 
 int buffy_lookup (const char* path) {
-  unsigned int i = 0;
+  int i = 0;
   if (list_empty(Incoming) || !path || !*path)
     return (-1);
   for (i = 0; i < Incoming->length; i++) {
@@ -268,7 +269,7 @@ int buffy_check (int force)
   struct stat contex_sb;
   time_t now, last1;
   CONTEXT *ctx;
-  unsigned int i = 0;
+  int i = 0;
   int local = 0, count = 0;
   time_t last2;
 
@@ -321,7 +322,7 @@ int buffy_check (int force)
      * before polling */
     if (!Context || !Context->path || (local ? (sb.st_dev != contex_sb.st_dev ||
                                                 sb.st_ino != contex_sb.st_ino) : 
-                                       !m_strcmp(tmp->path, Context->path))) {
+                                       m_strcmp(tmp->path, Context->path))) {
       switch (tmp->magic) {
       case M_MBOX:
       case M_MMDF:
@@ -491,7 +492,7 @@ int buffy_list (void)
   int pos;
   int first;
   int have_unnotified = BuffyNotify;
-  unsigned int i = 0;
+  int i = 0;
 
   pos = 0;
   first = 1;
@@ -555,7 +556,7 @@ int buffy_notify (void)
  */
 void buffy_next (char *s, size_t slen)
 {
-  unsigned int l = 0;
+  int l = 0;
   int c = 0, i = 0;
 
   if (list_empty(Incoming))