X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmx_imap.c;h=17147e5f54867b792c1d2a89b538c50be615aabd;hp=1c4358f00813dbad88151fd235bc2a20fcd0a952;hb=2ce8de509852f47a90f834b3e8d047e054810309;hpb=5b0581b41f115cd0442037a97db313ef5b5b8822

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index 1c4358f..17147e5 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -3,16 +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/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "imap_private.h"
@@ -20,8 +12,6 @@
 #include "mx.h"
 #include "mx_imap.h"
 
-
-
 int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
   url_scheme_t s;
   if (!path || !*path)
@@ -66,19 +56,17 @@ static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
   return (r);
 }
 
-mx_t* imap_reg_mx (void) {
-  mx_t* fmt = p_new(mx_t, 1);
-
-  /* make up mx_t record... */
-  fmt->type = M_IMAP;
-  fmt->mx_is_magic = imap_is_magic;
-  fmt->mx_access = imap_access;
-  fmt->mx_open_mailbox = imap_open_mailbox;
-  fmt->mx_open_new_message = imap_open_new_message;
-  fmt->mx_acl_check = acl_check_imap;
-  fmt->mx_fastclose_mailbox = imap_close_mailbox;
-  fmt->mx_sync_mailbox = imap_sync_mailbox;
-  fmt->mx_check_mailbox = _imap_check_mailbox;
-  fmt->mx_commit_message = imap_commit_message;
-  return (fmt);
-}
+mx_t const imap_mx = {
+    M_IMAP,
+    0,
+    imap_is_magic,
+    NULL,
+    imap_access,
+    imap_open_mailbox,
+    imap_open_new_message,
+    acl_check_imap,
+    _imap_check_mailbox,
+    imap_close_mailbox,
+    imap_sync_mailbox,
+    imap_commit_message,
+};