aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/providers/imap/camel-imap-folder.c156
-rw-r--r--camel/providers/imap/camel-imap-folder.h2
-rw-r--r--camel/providers/imap/camel-imap-store.c2
4 files changed, 81 insertions, 87 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index d221224436..1277d2d834 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-25 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
+ Optimized to try and get the new message headers without reloading
+ the entire summary from scratch.
+ (imap_get_summary_internal): Will now sync() before attempting to reload
+ the summary so that flags are set in the reloaded summary as well.
+
2000-07-24 Jeffrey Stedfast <fejj@helixcode.com>
* providers/imap/camel-imap-store.c (get_folder): Updated to give special
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 6651e77d61..afd5011ba5 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -359,9 +359,11 @@ imap_expunge (CamelFolder *folder, CamelException *ex)
g_free (result);
+ /* FIXME: maybe remove the appropriate messages from the summary
+ so we don't need to refetch the entire summary? */
imap_summary_free (imap_folder->summary);
- camel_imap_folder_changed (folder, ex);
+ camel_imap_folder_changed (folder, -1, ex);
}
static gint
@@ -516,7 +518,7 @@ imap_append_message (CamelFolder *folder, CamelMimeMessage *message, guint32 fla
g_free (result);
g_free (folder_path);
- camel_imap_folder_changed (folder, ex);
+ camel_imap_folder_changed (folder, 1, ex);
}
static void
@@ -552,7 +554,7 @@ imap_copy_message_to (CamelFolder *source, const char *uid, CamelFolder *destina
g_free (result);
g_free (folder_path);
- camel_imap_folder_changed (destination, ex);
+ camel_imap_folder_changed (destination, 1, ex);
}
/* FIXME: Duplication of code! */
@@ -601,7 +603,7 @@ imap_move_message_to (CamelFolder *source, const char *uid, CamelFolder *destina
imap_set_message_flags (source, uid, CAMEL_MESSAGE_DELETED, ~(info->flags));
- camel_imap_folder_changed (destination, ex);
+ camel_imap_folder_changed (destination, 1, ex);
}
static GPtrArray *
@@ -986,6 +988,9 @@ imap_get_summary_internal (CamelFolder *folder, CamelException *ex)
num = imap_get_message_count_internal (folder, ex);
+ /* sync any previously set/changed message flags */
+ imap_sync (folder, FALSE, ex);
+
switch (num) {
case 0:
/* clean up any previous summary data */
@@ -1172,72 +1177,21 @@ imap_get_summary (CamelFolder *folder)
return imap_folder->summary;
}
-/* get a single message info, by uid */
-static const CamelMessageInfo *
-imap_get_message_info (CamelFolder *folder, const char *uid)
+/* get a single message info from the server */
+static CamelMessageInfo *
+imap_get_message_info_internal (CamelFolder *folder, guint id)
{
- CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
CamelMessageInfo *info = NULL;
struct _header_raw *h, *tail = NULL;
const char *received;
- char *result, *muid, *flags, *header, *q;
+ char *result, *uid, *flags, *header, *q;
int j, status;
- g_return_val_if_fail (*uid != '\0', NULL);
-
- if (imap_folder->summary) {
- int max, i;
-
- /* FIXME: use a hash table like the mbox provider does */
- max = imap_folder->summary->len;
- for (i = 0; i < max; i++) {
- info = g_ptr_array_index (imap_folder->summary, i);
- if (!strcmp (info->uid, uid))
- return info;
- }
- }
-
- return NULL;
-#if 0
- /* lets first check to see if we have the message info cached */
- if (imap_folder->summary) {
- int max, i;
-
- max = imap_folder->summary->len;
- for (i = 0; i < max; i++) {
- info = g_ptr_array_index (imap_folder->summary, i);
- if (!strcmp (info->uid, uid))
- return info;
- }
- } else {
- /* If the summary doesn't exist, lets create it from scratch */
- CamelException *ex;
- int max, i;
-
- ex = camel_exception_new ();
-
- if (!imap_get_summary_internal (folder, ex)) {
- camel_exception_free (ex);
- return NULL;
- }
- camel_exception_free (ex);
-
- max = imap_folder->summary->len;
- for (i = 0; i < max; i++) {
- info = g_ptr_array_index (imap_folder->summary, i);
- if (!strcmp (info->uid, uid))
- return info;
- }
-
- /* if it ain't here now, it ain't *gonna* be here */
- return NULL;
- }
-
/* we don't have a cached copy, so fetch it */
status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store), folder,
- &result, "UID FETCH %s (UID FLAGS BODY[HEADER.FIELDS "
+ &result, "FETCH %d (UID FLAGS BODY[HEADER.FIELDS "
"(SUBJECT FROM TO CC DATE MESSAGE-ID "
- "REFERENCES IN-REPLY-TO)])", uid);
+ "REFERENCES IN-REPLY-TO)])", id);
if (status != CAMEL_IMAP_OK) {
g_free (result);
@@ -1245,26 +1199,18 @@ imap_get_message_info (CamelFolder *folder, const char *uid)
}
/* lets grab the UID... */
- if (!(muid = e_strstrcase (result, "(UID "))) {
- d(fprintf (stderr, "Cannot get a uid for %s\n\n%s\n\n", uid, result));
+ if (!(uid = e_strstrcase (result, "(UID "))) {
+ d(fprintf (stderr, "Cannot get a uid for %d\n\n%s\n\n", id, result));
g_free (result);
return NULL;
}
- for (muid += 5; *muid && (*muid < '0' || *muid > '9'); muid++); /* advance to <uid> */
- for (q = muid; *q && *q >= '0' && *q <= '9'; q++); /* find the end of the <uid> */
- muid = g_strndup (muid, (gint)(q - muid));
-
- /* make sure the UIDs are identical */
- if (strcmp (muid, uid)) {
- d(fprintf (stderr, "UIDs are not identical %s != %s\n", uid, muid));
- g_free (result);
- g_free (muid);
- return NULL;
- }
+ for (uid += 5; *uid && (*uid < '0' || *uid > '9'); uid++); /* advance to <uid> */
+ for (q = uid; *q && *q >= '0' && *q <= '9'; q++); /* find the end of the <uid> */
+ uid = g_strndup (uid, (gint)(q - uid));
info = g_malloc0 (sizeof (CamelMessageInfo));
- info->uid = muid;
+ info->uid = uid;
d(fprintf (stderr, "*** info->uid = %s\n", info->uid));
/* now lets grab the FLAGS */
@@ -1356,17 +1302,32 @@ imap_get_message_info (CamelFolder *folder, const char *uid)
}
g_free (result);
+
+ return info;
+}
+
+/* get a single message info, by uid */
+static const CamelMessageInfo *
+imap_get_message_info (CamelFolder *folder, const char *uid)
+{
+ CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
+ CamelMessageInfo *info = NULL;
+
+ g_return_val_if_fail (*uid != '\0', NULL);
- /* since we didn't have it cached, lets add it to our cache */
if (imap_folder->summary) {
- g_ptr_array_add (imap_folder->summary, info);
- } else {
- imap_folder->summary = g_ptr_array_new ();
- g_ptr_array_add (imap_folder->summary, info);
+ int max, i;
+
+ /* FIXME: use a hash table like the mbox provider does */
+ max = imap_folder->summary->len;
+ for (i = 0; i < max; i++) {
+ info = g_ptr_array_index (imap_folder->summary, i);
+ if (!strcmp (info->uid, uid))
+ return info;
+ }
}
-
- return info;
-#endif
+
+ return NULL;
}
static GPtrArray *
@@ -1438,9 +1399,34 @@ imap_set_message_user_flag (CamelFolder *folder, const char *uid, const char *na
}
void
-camel_imap_folder_changed (CamelFolder *folder, CamelException *ex)
+camel_imap_folder_changed (CamelFolder *folder, gint recent, CamelException *ex)
{
- imap_get_summary_internal (folder, ex);
+ d(fprintf (stderr, "camel_imap_folder_changed: recent = %d\n", recent));
+
+ if (recent > 0) {
+ CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
+ CamelMessageInfo *info;
+ gint i, last;
+
+ if (!imap_folder->summary)
+ imap_folder->summary = g_ptr_array_new ();
+
+ last = imap_folder->summary->len + 1;
+
+ for (i = last; i < last + recent; i++) {
+ info = imap_get_message_info_internal (folder, i);
+ if (info) {
+ g_ptr_array_add (imap_folder->summary, info);
+ } else {
+ /* our hack failed so now we need to do it the old fashioned way */
+ imap_get_summary_internal (folder, ex);
+ break;
+ }
+ }
+ } else {
+ /* We either expunged messages or something... */
+ imap_get_summary_internal (folder, ex);
+ }
gtk_signal_emit_by_name (GTK_OBJECT (folder), "folder_changed", 0);
}
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index fed98d311c..1a68eb83fc 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -63,7 +63,7 @@ typedef struct {
CamelFolder *camel_imap_folder_new (CamelStore *parent, char *folder_name,
CamelException *ex);
-void camel_imap_folder_changed (CamelFolder *folder, CamelException *ex);
+void camel_imap_folder_changed (CamelFolder *folder, gint recent, CamelException *ex);
/* Standard Gtk function */
GtkType camel_imap_folder_get_type (void);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index a8f6f8c6f0..a729d1923a 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -976,7 +976,7 @@ camel_imap_command_extended (CamelImapStore *store, CamelFolder *folder, char **
CamelException *ex;
ex = camel_exception_new ();
- camel_imap_folder_changed (folder, ex);
+ camel_imap_folder_changed (folder, recent, ex);
camel_exception_free (ex);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 22:57:46 +0800