X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fmx_nntp.c;h=08eee9a62f871b31ffe313b64b00f75805f3f732;hb=e176d53ddc6abf804824cad054a424f45c0a945e;hp=3d7196b23305a8a510655aebc6f8c362061e76bc;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a;p=apps%2Fmadmutt.git

diff --git a/nntp/mx_nntp.c b/nntp/mx_nntp.c
index 3d7196b..08eee9a 100644
--- a/nntp/mx_nntp.c
+++ b/nntp/mx_nntp.c
@@ -3,13 +3,8 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
-#include <sys/stat.h>
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "nntp.h"
@@ -17,11 +12,6 @@
 #include "mx.h"
 #include "mx_nntp.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
-
-#include "url.h"
-
 static int nntp_is_magic (const char* path, struct stat* st) {
   url_scheme_t s = url_check_scheme (NONULL (path));
   return ((s == U_NNTP || s == U_NNTPS) ? M_NNTP : -1);
@@ -40,17 +30,17 @@ static int acl_check_nntp (CONTEXT* ctx, int bit) {
   }
 }
 
-/* called by nntp_init(); don't call elsewhere */
-mx_t* nntp_reg_mx (void) {
-  mx_t* fmt = mem_calloc (1, sizeof (mx_t));
-
-  /* make up mx_t record... */
-  fmt->type = M_NNTP;
-  fmt->mx_is_magic = nntp_is_magic;
-  fmt->mx_open_mailbox = nntp_open_mailbox;
-  fmt->mx_acl_check = acl_check_nntp;
-  fmt->mx_fastclose_mailbox = nntp_fastclose_mailbox;
-  fmt->mx_sync_mailbox = nntp_sync_mailbox;
-  fmt->mx_check_mailbox = nntp_check_mailbox;
-  return (fmt);
-}
+mx_t const nntp_mx = {
+    M_NNTP,
+    0,
+    nntp_is_magic,
+    NULL,
+    NULL,
+    nntp_open_mailbox,
+    NULL,
+    acl_check_nntp,
+    nntp_check_mailbox,
+    nntp_fastclose_mailbox,
+    nntp_sync_mailbox,
+    NULL,
+};