2007-09-21 [colin] 3.0.1cvs21

	* src/summaryview.c
		Remove unnecessary error when cancelling export to mbox.
		Patch by Pawel

diff --git a/ChangeLog b/ChangeLog
index e4adf6af95c6a571525cdde817c9ac45d11d7589..0efdf05cf1808be75bf562c28cabd3ea07abf2d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21 [colin]     3.0.1cvs21
+
+       * src/summaryview.c
+               Remove unnecessary error when cancelling export to mbox.
+               Patch by Pawel
+

 2007-09-21 [paul]      3.0.1cvs20
 
        * src/gtk/prefswindow.c
 2007-09-21 [paul]      3.0.1cvs20
 
        * src/gtk/prefswindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 6f468aa4f36805fcb738ef0cb9b1410ce7c7db30..32dd856115fa3e952560b772c8e2fe1a7d9b3854 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2884,3 +2884,4 @@
 ( cvs diff -u -r 1.274.2.212 -r 1.274.2.213 src/mainwindow.c;  ) > 3.0.1cvs18.patchset
 ( cvs diff -u -r 1.105.2.110 -r 1.105.2.111 src/prefs_account.c;  cvs diff -u -r 1.52.2.48 -r 1.52.2.49 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_quote.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/quote_fmt.c;  ) > 3.0.1cvs19.patchset
 ( cvs diff -u -r 1.12.2.42 -r 1.12.2.43 src/gtk/prefswindow.c;  ) > 3.0.1cvs20.patchset
 ( cvs diff -u -r 1.274.2.212 -r 1.274.2.213 src/mainwindow.c;  ) > 3.0.1cvs18.patchset
 ( cvs diff -u -r 1.105.2.110 -r 1.105.2.111 src/prefs_account.c;  cvs diff -u -r 1.52.2.48 -r 1.52.2.49 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_quote.c;  cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/quote_fmt.c;  ) > 3.0.1cvs19.patchset
 ( cvs diff -u -r 1.12.2.42 -r 1.12.2.43 src/gtk/prefswindow.c;  ) > 3.0.1cvs20.patchset

+( cvs diff -u -r 1.395.2.326 -r 1.395.2.327 src/summaryview.c;  ) > 3.0.1cvs21.patchset

diff --git a/configure.ac b/configure.ac
index a26bd371b47a541a558ba51df1f592631df12c41..d39c04b7884730167cc71fdfc9441d5090a913dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=20
+EXTRA_VERSION=21

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 39a1ec205de3785ad993c9f36db7e0bc49d4a3aa..43b2e6ed861d89c1cedde11bf033566fdc2c4747 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -7216,7 +7216,9 @@ gint summaryview_export_mbox_list(SummaryView *summaryview)
        gchar *mbox = filesel_select_file_save(_("Export to mbox file"), NULL);
        gint ret;
        
        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);
                return -1;
                
        ret = export_list_to_mbox(list, mbox);