2005-04-12 [paul] 1.9.6cvs33
authorPaul Mangan <paul@claws-mail.org>
Tue, 12 Apr 2005 06:39:20 +0000 (06:39 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 12 Apr 2005 06:39:20 +0000 (06:39 +0000)
* src/inc.c
if the recv dialog is visible, Cancel only
cancels the current account

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/inc.c

index f02f172aee99c1ce5e7a144f6ba9437981204352..90ff81e5d321cf72302c43e3f4e7e980efc57fbd 100644 (file)
@@ -1,3 +1,10 @@
+2005-04-12 [paul]      1.9.6cvs33
+
+       * src/inc.c
+               if the recv dialog is visible, Cancel only
+               cancels the current account
+
+
 2005-04-10 [colin]     1.9.6cvs32
 
        * src/filtering.c
index f5bf1bd33417dfce0a19f4350a42b390252e62ce..9df82d4799045cfb30d44950aea8e3ba43ccd03f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.105.2.20 -r 1.105.2.21 src/prefs_account.c; cvs diff -u -r 1.382.2.116 -r 1.382.2.117 src/compose.c; ) > 1.9.6cvs30.patchset
 ( cvs diff -u -r 1.149.2.21 -r 1.149.2.22 src/inc.c; ) > 1.9.6cvs31.patchset
 ( cvs diff -u -r 1.60.2.5 -r 1.60.2.6 src/filtering.c; ) > 1.9.6cvs32.patchset
+( cvs diff -u -r 1.149.2.22 -r 1.149.2.23 src/inc.c; ) > 1.9.6cvs33.patchset
index 989e56a9f317cd5fe8460dcfdad0316b07983cff..ecb5f6bdddc6c7b2c6950755364d46a8183b306d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 237f1f7483c43b8f4e93b931326e31a96c701d08..a6201b3fb0f0dbc5e387a5c73c9d22c8889ef279 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -601,7 +601,8 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                        break;
                case INC_CANCEL:
                        SET_PIXMAP_AND_TEXT(okpix, _("Cancelled"));
-                       cancelled = TRUE;
+                       if (!inc_dialog->show_dialog)
+                               cancelled = TRUE;
                        break;
                default:
                        break;