2007-01-12 [colin] 2.7.0cvs17

	* src/etpan/imap-thread.c
		Make sure we get rid of the previous mailimap
		when connecting - just in case disconnect was
		unclean

diff --git a/ChangeLog b/ChangeLog
index 3a9fef99e5fee08af1da0dfded6327bfbb973f09..8c7043a986d06e68b2abc88e3af7d5568b789771 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-12 [colin]     2.7.0cvs17
+
+       * src/etpan/imap-thread.c
+               Make sure we get rid of the previous mailimap
+               when connecting - just in case disconnect was
+               unclean
+
 2007-01-12 [paul]      2.7.0cvs16
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 44e69f253349079cfeb6a31374efd6f27342c10f..4403f56646a9b088f1909dd48c2c6602b13fa334 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2243,3 +2243,4 @@
 ( cvs diff -u -r 1.83.2.97 -r 1.83.2.98 src/mimeview.c;  ) > 2.7.0cvs14.patchset
 ( cvs diff -u -r 1.654.2.2295 -r 1.654.2.2296 configure.ac;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/addressbook.c;  cvs diff -u -r 1.26.2.30 -r 1.26.2.31 src/foldersel.c;  cvs diff -u -r 1.207.2.141 -r 1.207.2.142 src/folderview.c;  cvs diff -u -r 1.115.2.122 -r 1.115.2.123 src/main.c;  ) > 2.7.0cvs15.patchset
 ( cvs diff -u -r 1.382.2.350 -r 1.382.2.351 src/compose.c;  ) > 2.7.0cvs16.patchset
+( cvs diff -u -r 1.1.4.63 -r 1.1.4.64 src/etpan/imap-thread.c;  ) > 2.7.0cvs17.patchset

diff --git a/configure.ac b/configure.ac
index d83359311bcabdb138409a1908fc5bf7791c7ade..c01a4ac95816bdd81a1eb8c7f7a7f47b7ab9a036 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 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 c15b8f20df5855e7d3ccf89873026d22424bca15..b1299010fdb65147eb8df18aa6d00f9f382bcdab 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -415,6 +415,17 @@ int imap_threaded_connect(Folder * folder, const char * server, int port)
        chashdatum value;
        mailimap * imap;
        
+       imap = get_imap(folder);
+       if (imap) {
+               key.data = &folder;
+               key.len = sizeof(folder);
+               value.data = imap;
+               value.len = 0;
+               chash_delete(session_hash, &key, NULL);
+               mailimap_free(imap);
+               debug_print("deleted old imap\n");
+       }
+
        imap = mailimap_new(0, NULL);
        
        key.data = &folder;
@@ -488,6 +499,17 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port)
        unsigned char *certificate = NULL;
        int cert_len;
 
+       imap = get_imap(folder);
+       if (imap) {
+               key.data = &folder;
+               key.len = sizeof(folder);
+               value.data = imap;
+               value.len = 0;
+               chash_delete(session_hash, &key, NULL);
+               mailimap_free(imap);
+               debug_print("deleted old imap\n");
+       }
+
        imap = mailimap_new(0, NULL);
        
        key.data = &folder;
@@ -2706,6 +2728,17 @@ int imap_threaded_connect_cmd(Folder * folder, const char * command,
        chashdatum value;
        mailimap * imap;
        
+       imap = get_imap(folder);
+       if (imap) {
+               key.data = &folder;
+               key.len = sizeof(folder);
+               value.data = imap;
+               value.len = 0;
+               chash_delete(session_hash, &key, NULL);
+               mailimap_free(imap);
+               debug_print("deleted old imap\n");
+       }
+
        imap = mailimap_new(0, NULL);
        
        key.data = &folder;