X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.c;h=2141454cf26469bad330fb80c716d79b0045b72a;hp=4f3c812a86ce239ce1341b061e43b15236035f14;hb=124aee0f600ef550fd1c73e8d7a60556f4f6afd0;hpb=1ee89902de184a640c171ae3285bff6882a791bd

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 4f3c812..2141454 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -14,11 +14,10 @@
 #include <lib-mime/mime.h>
 #include <lib-ui/curses.h>
 #include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "sort.h"
-#include "mx.h"
-#include "mx_nntp.h"
 #include "nntp.h"
 #include "buffy.h"
 
@@ -33,7 +32,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
   BUFFY* tmp = NULL;
   char buf[STRING];
 
-  if (list_empty (Incoming))
+  if (!Incoming.len)
     return;
 
   /* unfortunately, NNTP_DATA::group only is the plain
@@ -54,7 +53,7 @@ void nntp_sync_sidebar (NNTP_DATA* data) {
   if ((i = buffy_lookup (buf)) < 0)
     return;
 
-  tmp = (BUFFY*) Incoming->data[i];
+  tmp = Incoming.arr[i];
   /* copied from browser.c */
   if (option (OPTMARKOLD) &&
       data->lastCached >= data->firstMessage &&
@@ -802,7 +801,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 /* 
  * currently, nntp "mailbox" is "newsgroup"
  */
-int nntp_open_mailbox (CONTEXT * ctx)
+static int nntp_open_mailbox (CONTEXT * ctx)
 {
   NNTP_DATA *nntp_data;
   NNTP_SERVER *serv;
@@ -1089,7 +1088,7 @@ void nntp_delete_data (void *p)
   p_delete(&data);
 }
 
-int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
+static int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
 {
   NNTP_DATA *data = ctx->data;
 
@@ -1102,7 +1101,7 @@ int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
   return 0;
 }
 
-void nntp_fastclose_mailbox (CONTEXT * ctx)
+static void nntp_fastclose_mailbox (CONTEXT * ctx)
 {
   NNTP_DATA *data = (NNTP_DATA *) ctx->data, *tmp;
 
@@ -1204,7 +1203,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
   return 0;
 }
 
-int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2)
+static int nntp_check_mailbox (CONTEXT * ctx, int* unused1, int unused2)
 {
   return _nntp_check_mailbox (ctx, (NNTP_DATA *) ctx->data);
 }
@@ -1286,7 +1285,7 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force)
       if (l->data && ((NNTP_DATA *) l->data)->subscribed)
         _nntp_check_mailbox (NULL, (NNTP_DATA *) l->data);
     }
-    sidebar_draw (CurrentMenu);
+    sidebar_draw ();
   }
   else if (!force)
     return 0;
@@ -1501,3 +1500,36 @@ int nntp_check_children (CONTEXT * ctx, const char *msgid)
   p_delete(&cc.child);
   return ret;
 }
+
+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);
+}
+
+static int acl_check_nntp (CONTEXT* ctx, int bit) {
+  switch (bit) {
+    case ACL_INSERT:    /* editing messages */
+    case ACL_WRITE:     /* change importance */
+      return (0);
+    case ACL_DELETE:    /* (un)deletion */
+    case ACL_SEEN:      /* mark as read */
+      return (1);
+    default:
+      return (0);
+  }
+}
+
+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,
+};