2007-01-14 [colin] 2.7.0cvs25

	* src/etpan/imap-thread.c
		Close socket manually before
		freeing the imap struct

diff --git a/ChangeLog b/ChangeLog
index 18faa1d13a8daae8c929e6378a7f83b53344ec94..b311edfee28ff86f5657ec40b1b55d1632845581 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-14 [colin]     2.7.0cvs25
+
+       * src/etpan/imap-thread.c
+               Close socket manually before
+               freeing the imap struct
+
 2007-01-14 [colin]     2.7.0cvs24
 
        * src/etpan/imap-thread.c

diff --git a/PATCHSETS b/PATCHSETS
index ef1ea99cb3560589b846433c8ed60614bd525c81..c02508c6f8be7a85b843a9a15511a0d56c55c53c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2251,3 +2251,4 @@
 ( cvs diff -u -r 1.274.2.162 -r 1.274.2.163 src/mainwindow.c;  cvs diff -u -r 1.395.2.274 -r 1.395.2.275 src/summaryview.c;  cvs diff -u -r 1.68.2.31 -r 1.68.2.32 src/summaryview.h;  ) > 2.7.0cvs22.patchset
 ( cvs diff -u -r 1.395.2.275 -r 1.395.2.276 src/summaryview.c;  ) > 2.7.0cvs23.patchset
 ( cvs diff -u -r 1.1.4.65 -r 1.1.4.66 src/etpan/imap-thread.c;  ) > 2.7.0cvs24.patchset
+( cvs diff -u -r 1.1.4.66 -r 1.1.4.67 src/etpan/imap-thread.c;  ) > 2.7.0cvs25.patchset

diff --git a/configure.ac b/configure.ac
index 4e07a4939756f99c54fada7962fac60c1961bdd3..2727fe240ff6002ac3ba9cfd78e069af15072ea2 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=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 1ce5fa378eed62321e92a5e226aba531845531d5..70696737f89b47468ad21c1235125a8343018055 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -45,7 +45,11 @@ void delete_imap(Folder *folder, mailimap *imap)
        key.data = &imap;
        key.len = sizeof(imap);
        chash_delete(courier_workaround_hash, &key, NULL);
-       imap->imap_stream = NULL; /* we don't want libetpan to logout */
+       if (imap->imap_stream) {
+               /* we don't want libetpan to logout */
+               mailstream_close(imap->imap_stream);
+               imap->imap_stream = NULL;
+       }
        debug_print("removing mailimap %p\n", imap);
        mailimap_free(imap);    
 }