Remove old compatibility quirks

4 files changed, 1 insertions, 170 deletions

diff --git a/libproto/mailer/Makefile.am b/libproto/mailer/Makefile.am
index 813b63e39..1c195eb49 100644
--- a/libproto/mailer/Makefile.am
+++ b/libproto/mailer/Makefile.am
@@ -53,6 +53,4 @@ libmu_mailer_la_SOURCES = \
  smtp_send.c\
  smtp_starttls.c\
  smtp_trace.c\
- smtp_url.c\
- remote.c
-
+ smtp_url.c
diff --git a/libproto/mailer/remote.c b/libproto/mailer/remote.c
deleted file mode 100644
index c33f9eeaa..000000000
--- a/libproto/mailer/remote.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2009-2012, 2014-2016 Free Software Foundation, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General
-   Public License along with this library.  If not,
-   see <http://www.gnu.org/licenses/>. */
-
-/* This file provides backward-compatible "remote+" mailbox types,
-   introduced in v. 2.0.
-
-   They are only used by maidag.
-
-   This file will be removed in v. 2.2
-*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <mailutils/errno.h>
-#include <mailutils/error.h>
-#include <mailutils/diag.h>
-
-#include <mailutils/sys/url.h>
-#include <mailutils/sys/mailer.h>
-#include <mailutils/sys/registrar.h>
-
-#ifdef ENABLE_SMTP
-
-static int
-_url_remote_init (mu_url_t url, const char *new_scheme)
-{
-  char *scheme;
-  mu_record_t record;
-  int rc;
-  
-  mu_diag_output (MU_DIAG_WARNING,
-		  "%s: this URL scheme is deprecated, use %s instead",
-		  url->name, new_scheme);
-
-  rc = mu_registrar_lookup_scheme (new_scheme, &record);
-  if (rc)
-    return rc;
-
-  scheme = strdup (new_scheme);
-  if (!scheme)
-    return ENOMEM;
-  
-  free (url->scheme);
-  url->scheme = scheme;
-  
-  return record->_url ? record->_url (url) : 0;
-}
-
-
-static int
-_url_remote_smtp_init (mu_url_t url)
-{
-  return _url_remote_init (url, "smtp");
-}
-
-static struct _mu_record _mu_remote_smtp_record = {
-  MU_SMTP_PRIO,
-  "remote+smtp",
-  MU_RECORD_DEFAULT,
-  MU_URL_SCHEME | MU_URL_CRED | MU_URL_INET | MU_URL_PATH | MU_URL_PARAM,
-  MU_URL_HOST,
-  _url_remote_smtp_init,	/* url init.  */
-  _mu_mailer_mailbox_init,      /* Mailbox init.  */
-  NULL,		                /* Mailer init.  */
-  _mu_mailer_folder_init,	/* Folder init.  */
-  NULL,				/* No need for a back pointer.  */
-  NULL,				/* _is_scheme method.  */
-  NULL,				/* _get_url method.  */
-  NULL,				/* _get_mailbox method.  */
-  NULL,				/* _get_mailer method.  */
-  NULL				/* _get_folder method.  */
-};
-
-mu_record_t mu_remote_smtp_record = &_mu_remote_smtp_record;
-#else
-mu_record_t mu_remote_smtp_record = NULL;
-#endif
-
-
-#ifdef ENABLE_SENDMAIL
-static int
-_url_remote_sendmail_init (mu_url_t url)
-{
-  return _url_remote_init (url, "sendmail");
-}
-
-static struct _mu_record _mu_remote_sendmail_record =
-{
-  MU_SENDMAIL_PRIO,
-  "remote+sendmail",
-  MU_RECORD_DEFAULT,
-  MU_URL_SCHEME | MU_URL_PATH,
-  MU_URL_PATH,
-  _url_remote_sendmail_init,    /* url init.  */
-  _mu_mailer_mailbox_init,      /* Mailbox entry.  */
-  _mu_mailer_sendmail_init, /* Mailer entry.  */
-  _mu_mailer_folder_init, /* Folder entry.  */
-  NULL, /* No need for a back pointer.  */
-  NULL, /* _is_scheme method.  */
-  NULL, /* _get_url method.  */
-  NULL, /* _get_mailbox method.  */
-  NULL, /* _get_mailer method.  */
-  NULL  /* _get_folder method.  */
-};
-
-
-mu_record_t mu_remote_sendmail_record = &_mu_remote_sendmail_record;
-
-
-static int
-_url_remote_prog_init (mu_url_t url)
-{
-  return _url_remote_init (url, "prog");
-}
-
-static struct _mu_record _mu_remote_prog_record =
-{
-  MU_PROG_PRIO,
-  "remote+prog",
-  MU_RECORD_DEFAULT,
-  MU_URL_SCHEME | MU_URL_CRED | MU_URL_PATH | MU_URL_QUERY,
-  MU_URL_PATH,
-  _url_remote_prog_init,    /* url init.  */
-  _mu_mailer_mailbox_init,  /* Mailbox entry.  */
-  _mu_mailer_prog_init, /* Mailer entry.  */
-  _mu_mailer_folder_init, /* Folder entry.  */
-  NULL, /* No need for a back pointer.  */
-  NULL, /* _is_scheme method.  */
-  NULL, /* _get_url method.  */
-  NULL, /* _get_mailbox method.  */
-  NULL, /* _get_mailer method.  */
-  NULL  /* _get_folder method.  */
-};
-
-mu_record_t mu_remote_prog_record = &_mu_remote_prog_record;
-
-#else
-mu_record_t mu_remote_sendmail_record = NULL;
-mu_record_t mu_remote_prog_record = NULL;
-#endif
diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index 6e97b80e6..2bf9a763e 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -602,5 +602,4 @@ _mailer_smtp_init (mu_mailer_t mailer)
 #include <stdio.h>
 #include <mailutils/sys/registrar.h>
 mu_record_t     mu_smtp_record = NULL;
-mu_record_t     mu_remote_smtp_record = NULL;
 #endif
diff --git a/maidag/maidag.c b/maidag/maidag.c
index ae041baa3..9e23c29ee 100644
--- a/maidag/maidag.c
+++ b/maidag/maidag.c
@@ -508,13 +508,6 @@ struct mu_cli_setup cli = {
   l - sieve action logs\n\
   0-9 - Set maidag debugging level\n")
 };
-
-/* FIXME: These are for compatibility with MU 2.0.
-   Remove in 2.2 */
-extern mu_record_t mu_remote_smtp_record;
-extern mu_record_t mu_remote_sendmail_record;
-extern mu_record_t mu_remote_prog_record;
-
 
 int
 main (int argc, char *argv[])