From 32a3a0d644a48527173e2caf111ffff383ee7e1b Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 1 Oct 2007 17:09:59 +0000 Subject: [PATCH] 2007-10-01 [colin] 3.0.1cvs20-stable * src/summaryview.c From 3.0.1cvs21 Remove unnecessary error when cancelling export to mbox. Patch by Pawel --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/summaryview.c | 4 +++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04064cc0f..743f25e0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-01 [colin] 3.0.1cvs20-stable + + * src/summaryview.c + From 3.0.1cvs21 + Remove unnecessary error when cancelling export to mbox. + Patch by Pawel + 2007-10-01 [colin] 3.0.1cvs19-stable * src/mimeview.c diff --git a/PATCHSETS b/PATCHSETS index 7beaae54e..ca0219a0a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2877,3 +2877,4 @@ ( cvs diff -u -r 1.179.2.186.2.3 -r 1.179.2.186.2.4 src/imap.c; ) > 3.0.1cvs17-stable.patchset ( cvs diff -u -r 1.61.2.67.2.2 -r 1.61.2.67.2.3 src/account.c; ) > 3.0.1cvs18-stable.patchset ( cvs diff -u -r 1.83.2.115.2.1 -r 1.83.2.115.2.2 src/mimeview.c; ) > 3.0.1cvs19-stable.patchset +( cvs diff -u -r 1.395.2.324 -r 1.395.2.325 src/summaryview.c; ) > 3.0.1cvs20-stable.patchset diff --git a/configure.ac b/configure.ac index cfa96f70d..662421ed0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=19 +EXTRA_VERSION=20 EXTRA_RELEASE= EXTRA_GTK2_VERSION=-stable diff --git a/src/summaryview.c b/src/summaryview.c index 4338ada35..cc94c00ae 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -7219,7 +7219,9 @@ gint summaryview_export_mbox_list(SummaryView *summaryview) gchar *mbox = filesel_select_file_save(_("Export to mbox file"), NULL); gint ret; - if (mbox == NULL || list == NULL) + if (mbox == NULL) + return -2; + if (list == NULL) return -1; ret = export_list_to_mbox(list, mbox); -- 2.11.4.GIT