Changeset 5052:b0014913dd74

Timestamp:

2007-04-02 19:19:55 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Add hook for proper IMAP unseen count in mailbox browser

Files:

• browser.c (modified) (2 diffs)
• browser.h (modified) (1 diff)
• imap/browse.c (modified) (1 diff)
• imap/imap.h (modified) (1 diff)

browser.c

@@ -427 +427 @@
   char buffer[LONG_STRING];
   BUFFY *tmp = Incoming;
+#ifdef USE_IMAP
+  struct mailbox_state mbox;
+#endif
 
   if (!Incoming)
@@ -439 +442 @@
     if (mx_is_imap (tmp->path))
     {
-      add_folder (menu, state, tmp->path, NULL, tmp->new);
+      imap_mailbox_state (tmp->path, &mbox);
+      add_folder (menu, state, tmp->path, NULL, mbox.new);
       continue;
     }

browser.h

@@ -56 +56 @@
 };
 
+struct mailbox_state
+{
+  unsigned int new;
+  unsigned int old;
+  unsigned int messages;
+};
 #endif /* _BROWSER_H */

imap/browse.c

@@ -252 +252 @@
   FREE (&mx.mbox);
   return -1;
+}
+
+int imap_mailbox_state (const char* path, struct mailbox_state* state)
+{
+  IMAP_DATA* idata;
+  IMAP_MBOX mx;
+  IMAP_STATUS* status;
+
+  memset (state, 0, sizeof (*state));
+  if (imap_parse_path (path, &mx) < 0)
+  {
+    dprint (1, (debugfile, "imap_mailbox_state: bad path %s\n", path));
+    return -1;
+  }
+  if (!(idata = imap_conn_find (&mx.account, M_IMAP_CONN_NONEW)))
+  {
+    dprint (2, (debugfile, "imap_mailbox_state: no open connection for %s\n",
+                path));
+    FREE (&mx.mbox);
+    return -1;
+  }
+
+  if ((status = imap_mboxcache_get (idata, mx.mbox, 0)))
+  {
+    state->new = status->unseen;
+    state->messages = status->messages;
+  }
+
+  return 0;
 }
 

imap/imap.h

@@ -51 +51 @@
 /* browse.c */
 int imap_browse (char* path, struct browser_state* state);
+int imap_mailbox_state (const char* path, struct mailbox_state* state);
 int imap_mailbox_create (const char* folder);
 int imap_mailbox_rename (const char* mailbox);