2005-04-10 [colin] 1.9.6cvs31
[claws.git] / src / inc.c
index 0832e043a8e529e90506bbf033612d21f55022b5..237f1f7483c43b8f4e93b931326e31a96c701d08 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -496,6 +496,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
        FolderItem *processing, *inbox;
        MsgInfo *msginfo;
        GSList *msglist, *msglist_element;
+       gboolean cancelled = FALSE;
 
        qlist = inc_dialog->queue_list;
        while (qlist != NULL) {
@@ -546,7 +547,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                                 str);                                     \
 }
 
-       for (; inc_dialog->queue_list != NULL; inc_dialog->cur_row++) {
+       for (; inc_dialog->queue_list != NULL && !cancelled; inc_dialog->cur_row++) {
                session = inc_dialog->queue_list->data;
                pop3_session = POP3_SESSION(session->session);
 
@@ -600,6 +601,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                        break;
                case INC_CANCEL:
                        SET_PIXMAP_AND_TEXT(okpix, _("Cancelled"));
+                       cancelled = TRUE;
                        break;
                default:
                        break;