X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=commands.c;h=13d26e277abb5cb6efbdb33d23b2b44ee3d71cb5;hb=90d59c61839822ec7897955ffa815eb358224d2c;hp=6bef5790d5e674dd8a47bd2b4693540f64eea99e;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b;p=apps%2Fmadmutt.git

diff --git a/commands.c b/commands.c
index 6bef579..13d26e2 100644
--- a/commands.c
+++ b/commands.c
@@ -17,7 +17,6 @@
 #include "mutt_menu.h"
 #include "mime.h"
 #include "sort.h"
-#include "mailbox.h"
 #include "copy.h"
 #include "mx.h"
 #include "pager.h"
@@ -39,6 +38,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <errno.h>
 #include <unistd.h>
@@ -352,7 +352,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd,
     mutt_endwin (NULL);
 
     if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
-      mutt_perror _("Can't create filter process");
+      mutt_perror (_("Can't create filter process"));
 
       return 1;
     }
@@ -383,7 +383,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd,
                              M_MESSAGEHOOK);
           mutt_endwin (NULL);
           if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
-            mutt_perror _("Can't create filter process");
+            mutt_perror (_("Can't create filter process"));
 
             return 1;
           }
@@ -400,7 +400,7 @@ static int _mutt_pipe_message (HEADER * h, char *cmd,
     else {
       mutt_endwin (NULL);
       if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
-        mutt_perror _("Can't create filter process");
+        mutt_perror (_("Can't create filter process"));
 
         return 1;
       }
@@ -742,7 +742,7 @@ int mutt_save_message (HEADER * h, int delete,
   mutt_message (_("Copying to %s..."), buf);
 
 #ifdef USE_IMAP
-  if (Context->magic == M_IMAP && !(decode || decrypt) && mx_is_imap (buf)) {
+  if (Context->magic == M_IMAP && !(decode || decrypt) && mx_get_magic (buf) == M_IMAP) {
     switch (imap_copy_messages (Context, h, buf, delete)) {
       /* success */
     case 0:
@@ -780,7 +780,7 @@ int mutt_save_message (HEADER * h, int delete,
 #ifdef BUFFY_SIZE
       tmp = mutt_find_mailbox (buf);
       if (tmp && tmp->new <= 0)
-        mutt_update_mailbox (tmp);
+        buffy_update_mailbox (tmp);
 #else
       /* fix up the times so buffy won't get confused */
       if (st.st_mtime > st.st_atime) {
@@ -811,26 +811,26 @@ int mutt_update_list_file (char *filename, char *section, char *key,
   int ext = 0, done = 0, r = 0;
 
   snprintf (oldfile, sizeof (oldfile), "%s.bak", filename);
-  dprint (1, (debugfile, "Renaming %s to %s\n", filename, oldfile));
+  debug_print (1, ("Renaming %s to %s\n", filename, oldfile));
 
   /* if file not exist, create it */
   if ((ifp = safe_fopen (filename, "a")))
     fclose (ifp);
   if (_mutt_rename_file (filename, oldfile, 1)) {
-    mutt_perror _("Unable to create backup file");
+    mutt_perror (_("Unable to create backup file"));
 
     return (-1);
   }
-  dprint (1, (debugfile, "Opening %s\n", oldfile));
+  debug_print (1, ("Opening %s\n", oldfile));
   if (!(ifp = safe_fopen (oldfile, "r"))) {
-    mutt_perror _("Unable to open backup file for reading");
+    mutt_perror (_("Unable to open backup file for reading"));
 
     return (-1);
   }
-  dprint (1, (debugfile, "Opening %s\n", filename));
+  debug_print (1, ("Opening %s\n", filename));
   if (!(ofp = safe_fopen (filename, "w"))) {
     fclose (ifp);
-    mutt_perror _("Unable to open new file for writing");
+    mutt_perror (_("Unable to open new file for writing"));
 
     return (-1);
   }