From 6721ce4c822f11fd65cd31c41821a3ae15736a93 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 5 Feb 2006 21:04:23 +0000 Subject: [PATCH] 2006-02-05 [colin] 2.0.0cvs17 * src/imap.c Add the f*cking missing expunge that caused imap_fetch_env to fail after an add_msgs ! :-/// * src/etpan/imap-thread.c Add a bit of debug --- ChangeLog | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/etpan/imap-thread.c | 3 +++ src/imap.c | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 88ad8ada4..4fe61cd6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-02-05 [colin] 2.0.0cvs17 + + * src/imap.c + Add the f*cking missing expunge that caused imap_fetch_env + to fail after an add_msgs ! :-/// + * src/etpan/imap-thread.c + Add a bit of debug + 2006-02-05 [colin] 2.0.0cvs16 * src/common/utils.c diff --git a/PATCHSETS b/PATCHSETS index 24e72db7f..16b2d5e85 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1200,3 +1200,4 @@ ( diff -u /dev/null tools/tbird2syl.py; cvs diff -u -r 1.25.2.8 -r 1.25.2.9 tools/Makefile.am; ) > 2.0.0cvs14.patchset ( cvs diff -u -r 1.96.2.92 -r 1.96.2.93 src/textview.c; ) > 2.0.0cvs15.patchset ( cvs diff -u -r 1.36.2.54 -r 1.36.2.55 src/common/utils.c; ) > 2.0.0cvs16.patchset +( cvs diff -u -r 1.179.2.90 -r 1.179.2.91 src/imap.c; cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/etpan/imap-thread.c; ) > 2.0.0cvs17.patchset diff --git a/configure.ac b/configure.ac index 1877c5e5e..b78831051 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=16 +EXTRA_VERSION=17 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index 76e3a1021..47835f4a2 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -1856,11 +1856,13 @@ imap_get_envelopes_list(mailimap * imap, struct mailimap_set * set, break; default: mailimap_fetch_type_free(fetch_type); + debug_print("uid_fetch: %d\n", r); return r; } if (clist_begin(fetch_result) == NULL) { res = MAILIMAP_ERROR_FETCH; + debug_print("clist_begin = NULL\n"); goto err; } @@ -1870,6 +1872,7 @@ imap_get_envelopes_list(mailimap * imap, struct mailimap_set * set, if (r != MAILIMAP_NO_ERROR) { mailimap_fetch_type_free(fetch_type); res = MAILIMAP_ERROR_MEMORY; + debug_print("fetch_result_to_envelop_list: %d\n", res); goto err; } diff --git a/src/imap.c b/src/imap.c index a6c858094..c428a0b9d 100644 --- a/src/imap.c +++ b/src/imap.c @@ -1117,6 +1117,7 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list, statusbar_progress_all(0,0,0); statusbar_pop_all(); + imap_cmd_expunge(session); unlock_session(); g_free(destdir); -- 2.25.1