X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcomplete.c;h=f8a660aa032e272ed3c166d47159d32d9ed1be18;hp=2ad60ac4dc1c54b99eaa7bbd18626524d93929bf;hb=88d239144bf6f50ca1eda6db7742281f0ad0f97f;hpb=96e4b6de291b2195b26289fb03536acd101c6650;ds=sidebyside

diff --git a/lib-ui/complete.c b/lib-ui/complete.c
index 2ad60ac..f8a660a 100644
--- a/lib-ui/complete.c
+++ b/lib-ui/complete.c
@@ -7,25 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <dirent.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
+#include <lib-ui/lib-ui.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"
 #include <imap/imap.h>
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
 
 /* given a partial pathname, this routine fills in as much of the rest of the
  * path as is unique.
@@ -44,56 +30,6 @@ int mutt_complete (char *s, ssize_t slen)
 
   char imap_path[LONG_STRING];
 
-#ifdef USE_NNTP
-  if (option (OPTNEWS)) {
-    string_list_t *l = CurrentNewsSrv->list;
-
-    m_strcpy(filepart, sizeof(filepart), s);
-
-    /*
-     * special case to handle when there is no filepart yet.
-     * find the first subscribed newsgroup
-     */
-    if ((len = m_strlen(filepart)) == 0) {
-      for (; l; l = l->next) {
-        NNTP_DATA *data = (NNTP_DATA *) l->data;
-
-        if (data && data->subscribed) {
-          m_strcpy(filepart, sizeof(filepart), data->group);
-          init++;
-          l = l->next;
-          break;
-        }
-      }
-    }
-
-    for (; l; l = l->next) {
-      NNTP_DATA *data = (NNTP_DATA *) l->data;
-
-      if (data && data->subscribed &&
-          m_strncmp(data->group, filepart, len) == 0) {
-        if (init) {
-          for (i = 0; filepart[i] && data->group[i]; i++) {
-            if (filepart[i] != data->group[i]) {
-              filepart[i] = 0;
-              break;
-            }
-          }
-          filepart[i] = 0;
-        }
-        else {
-          m_strcpy(filepart, sizeof(filepart), data->group);
-          init = 1;
-        }
-      }
-    }
-
-    strcpy (s, filepart);
-
-    return (init ? 0 : -1);
-  }
-#endif
-
   /* we can use '/' as a delimiter, imap_complete rewrites it */
   if (*s == '=' || *s == '+' || *s == '!') {
       const char *q = NONULL(*s == '!' ? Spoolfile : Maildir);
@@ -156,7 +92,7 @@ int mutt_complete (char *s, ssize_t slen)
   }
 
   if (dirp == NULL) {
-    return (-1);
+    return -1;
   }
 
   /*
@@ -218,5 +154,5 @@ int mutt_complete (char *s, ssize_t slen)
   else
     m_strcpy(s, slen, filepart);
 
-  return (init ? 0 : -1);
+  return init ? 0 : -1;
 }