disconnect immediately when cancelled (possibly fixes crash after cancellation).

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1611 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 20fce511..d7f635a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-11
+
+	* src/inc.c: inc_cancel()
+	  src/send_message.c: send_cancel_button_cb(): disconnect immediately
+	  when cancelled (possibly fixes crash after cancellation).
+
 2007-04-10
 
 	* src/importcsv.c: added Remarks field. Fixed reorder of the last row.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 0f53b8b6..2d17ee3d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2007-04-11
+
+	* src/inc.c: inc_cancel()
+	  src/send_message.c: send_cancel_button_cb(): キャンセルした場合
+	  すぐに切断するようにした(キャンセル後のクラッシュを恐らく修正)。
+
 2007-04-10
 
 	* src/importcsv.c: 備考フィールドを追加。最後の行の順序変更を修正。
diff --git a/src/inc.c b/src/inc.c
index f822216b..4a0c96d8 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -1384,6 +1384,7 @@ static void inc_cancel(IncProgressDialog *dialog, gboolean cancel_all)
 	for (list = dialog->queue_list; list != NULL; list = list->next) {
 		session = list->data;
 		session->inc_state = INC_CANCEL;
+		session_disconnect(session->session);
 		if (!cancel_all)
 			break;
 	}
diff --git a/src/send_message.c b/src/send_message.c
index 5ab1345d..8d58fd30 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -753,6 +753,7 @@ static void send_cancel_button_cb(GtkWidget *widget, gpointer data)
 	SendProgressDialog *dialog = (SendProgressDialog *)data;
 
 	dialog->cancelled = TRUE;
+	session_disconnect(dialog->session);
 }
 
 static void send_put_error(Session *session)