Revert "we use glibc, and gconv. Don't need our own transcoding stuff, glibc does"

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 8ab32c1..1c23817 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -14,7 +14,6 @@
 #include <pwd.h>
 
 #include <lib-ui/lib-ui.h>
-#include <lib-ui/enter.h>
 #include <lib-sys/unix.h>
 #include <imap/imap.h>
 
@@ -22,6 +21,8 @@
 #include "mutt.h"
 #include "attach.h"
 
+const char *madmutt_version = "Madmutt/" MUTT_VERSION;
+
 /* Modified by blong to accept a "suggestion" for file name.  If
  * that file exists, then construct one with unique name but 
  * keep any extension.  This might fail, I guess.
@@ -312,14 +313,6 @@ int mutt_save_confirm (const char *s, struct stat *st)
     return 1;
   }
 
-#ifdef USE_NNTP
-  if (magic == M_NNTP) {
-    mutt_error _("Can't save message to newsserver.");
-
-    return 0;
-  }
-#endif
-
   if (magic > 0 && !mx_access (s, W_OK)) {
     if (option (OPTCONFIRMAPPEND) &&
         (!TrashPath || (m_strcmp(s, TrashPath) != 0))) {
@@ -357,8 +350,6 @@ int mutt_save_confirm (const char *s, struct stat *st)
       }
     }
   }
-
-  CLEARLINE (LINES - 1);
   return (ret);
 }
 
@@ -367,13 +358,6 @@ void mutt_sleep (short s)
     sleep(MAX(s, SleepTime));
 }
 
-const char *mutt_make_version(void)
-{
-  static char vstring[STRING];
-  snprintf(vstring, sizeof (vstring), "Madmutt/%s", MUTT_VERSION);
-  return vstring;
-}
-
 /* return 1 if address lists are strictly identical */
 static int mutt_cmp_addr (const address_t * a, const address_t * b)
 {