oopsie, sometimes grep hurts :P

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/imap/browse.c b/imap/browse.c
index 4f4bee0..10e9e48 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -63,7 +63,7 @@ int imap_browse (char *path, struct browser_state *state)
   save_lsub = option (OPTIMAPCHECKSUBSCRIBED);
   unset_option (OPTIMAPCHECKSUBSCRIBED);
   m_strcpy(list_cmd, sizeof(list_cmd),
   save_lsub = option (OPTIMAPCHECKSUBSCRIBED);
   unset_option (OPTIMAPCHECKSUBSCRIBED);
   m_strcpy(list_cmd, sizeof(list_cmd),

-           option(OPTIMAPLSUB) ? "LSUB" : "string_list_t");
+           option(OPTIMAPLSUB) ? "LSUB" : "LIST");

 
   if (!(idata = imap_conn_find (&(mx.account), 0)))
     goto fail;
 
   if (!(idata = imap_conn_find (&(mx.account), 0)))
     goto fail;


@@ -178,7 +178,7 @@ int imap_browse (char *path, struct browser_state *state)
     /* Listing the home namespace, so INBOX should be included. Home 
      * namespace is not "", so we have to list it explicitly. We ask the 
      * server to see if it has descendants. */
     /* Listing the home namespace, so INBOX should be included. Home 
      * namespace is not "", so we have to list it explicitly. We ask the 
      * server to see if it has descendants. */

-    if (browse_add_list_result (idata, "string_list_t \"\" \"INBOX\"", state, 0))
+    if (browse_add_list_result (idata, "LIST \"\" \"INBOX\"", state, 0))

       goto fail;
   }
 
       goto fail;
   }
 


@@ -526,11 +526,11 @@ static int browse_verify_namespace (IMAP_DATA * idata,
      * than invisible namespaces */
     if (nsi->delim)
       snprintf (buf, sizeof (buf), "%s \"\" \"%s%c%%\"",
      * than invisible namespaces */
     if (nsi->delim)
       snprintf (buf, sizeof (buf), "%s \"\" \"%s%c%%\"",

-                option (OPTIMAPLSUB) ? "LSUB" : "string_list_t", nsi->prefix,
+                option (OPTIMAPLSUB) ? "LSUB" : "LIST", nsi->prefix,

                 nsi->delim);
     else
       snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",
                 nsi->delim);
     else
       snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",

-                option (OPTIMAPLSUB) ? "LSUB" : "string_list_t", nsi->prefix);
+                option (OPTIMAPLSUB) ? "LSUB" : "LIST", nsi->prefix);

 
     imap_cmd_start (idata, buf);
 
 
     imap_cmd_start (idata, buf);
 

diff --git a/imap/imap.c b/imap/imap.c
index a17cb8f..e54b81f 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1307,7 +1307,7 @@ int imap_parse_list_response (IMAP_DATA * idata, char **name, int *noselect,
     return -1;
 
   s = imap_next_word (idata->cmd.buf);
     return -1;
 
   s = imap_next_word (idata->cmd.buf);

-  if ((ascii_strncasecmp ("string_list_t", s, 4) == 0) ||
+  if ((ascii_strncasecmp ("LIST", s, 4) == 0) ||

       (ascii_strncasecmp ("LSUB", s, 4) == 0)) {
     *noselect = 0;
     *noinferiors = 0;
       (ascii_strncasecmp ("LSUB", s, 4) == 0)) {
     *noselect = 0;
     *noinferiors = 0;


@@ -1509,7 +1509,7 @@ int imap_complete (char *dest, size_t dlen, char *path) {
 
   /* fire off command */
   snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",
 
   /* fire off command */
   snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",

-            option (OPTIMAPLSUB) ? "LSUB" : "string_list_t", list);
+            option (OPTIMAPLSUB) ? "LSUB" : "LIST", list);

 
   imap_cmd_start (idata, buf);
 
 
   imap_cmd_start (idata, buf);
 

diff --git a/imap/message.c b/imap/message.c
index bbd7f7b..a3225e4 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -54,7 +54,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
   int rc, mfhrc, oldmsgcount;
   int fetchlast = 0;
   const char *want_headers =
   int rc, mfhrc, oldmsgcount;
   int fetchlast = 0;
   const char *want_headers =

-    "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES string_list_t-POST X-LABEL";
+    "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES LIST-POST X-LABEL";

 
 #ifdef USE_HCACHE
   void *hc = NULL;
 
 #ifdef USE_HCACHE
   void *hc = NULL;

diff --git a/nntp/nntp.c b/nntp/nntp.c
index afe5c9e..d5b72f7 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -503,7 +503,7 @@ static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progre
   if (data->nserv->hasXGTITLE)
     snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
   else
   if (data->nserv->hasXGTITLE)
     snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
   else

-    snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask);
+    snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);

   if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
       0) {
   }
   if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
       0) {
   }


@@ -1372,7 +1372,7 @@ int nntp_get_active (NNTP_SERVER * serv)
   nntp_data.nserv = serv;
   nntp_data.group = NULL;
 
   nntp_data.nserv = serv;
   nntp_data.group = NULL;
 

-  if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) {
+  if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) {

     return -1;
   }
 
     return -1;
   }
 

diff --git a/pop/pop.c b/pop/pop.c
index 9b53409..9b569aa 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -51,7 +51,7 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
     return PFD_FUNCT_ERROR;
   }
 
     return PFD_FUNCT_ERROR;
   }
 

-  snprintf (buf, sizeof (buf), "string_list_t %d\r\n", h->refno);
+  snprintf (buf, sizeof (buf), "LIST %d\r\n", h->refno);

   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret == PQ_OK) {
     sscanf (buf, "+OK %d %ld", &idx, &length);
   ret = pop_query (pop_data, buf, sizeof (buf));
   if (ret == PQ_OK) {
     sscanf (buf, "+OK %d %ld", &idx, &length);