2009-05-21 [paul] 3.7.1cvs60

	* src/mainwindow.c
	* src/mainwindow.h
	* src/plugins/trayicon/trayicon.c
		when quitting from the trayicon, honour
		prefs_common.clean_on_exit

diff --git a/ChangeLog b/ChangeLog
index 8286477737c5169c30f183e7c1e047c7c35537a5..73c89729253d575238f52682d7c7a3f9249ff19a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-21 [paul]      3.7.1cvs60
+
+       * src/mainwindow.c
+       * src/mainwindow.h
+       * src/plugins/trayicon/trayicon.c
+               when quitting from the trayicon, honour
+               prefs_common.clean_on_exit
+
 2009-05-21 [paul]      3.7.1cvs59
 
        * src/gtk/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 882f66c6efe68fa1a15b82ad4a540a0d4b0736e4..d8c896fd3f451f65afc8a942483da905a2f5cc7f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3799,3 +3799,4 @@
 ( cvs diff -u -r 1.100.2.69 -r 1.100.2.70 AUTHORS;  cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/gtk/authors.h;  ) > 3.7.1cvs57.patchset
 ( cvs diff -u -r 1.17.2.55 -r 1.17.2.56 src/send_message.c;  ) > 3.7.1cvs58.patchset
 ( cvs diff -u -r 1.20.2.22 -r 1.20.2.23 src/gtk/Makefile.am;  ) > 3.7.1cvs59.patchset
+( cvs diff -u -r 1.274.2.301 -r 1.274.2.302 src/mainwindow.c;  cvs diff -u -r 1.39.2.56 -r 1.39.2.57 src/mainwindow.h;  cvs diff -u -r 1.14.2.68 -r 1.14.2.69 src/plugins/trayicon/trayicon.c;  ) > 3.7.1cvs60.patchset

diff --git a/configure.ac b/configure.ac
index e5d090d17d97db94e730492f56ea7d6d5007454b..ca2e4b37c4cbb20f1c2c6fcad2e0ebbf87d32fdb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=60
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5fabdb3e105294c27c45549e05f338ae3a09c6c8..ff0be721ca71c770929746e4149f8774d3d570c2 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2965,7 +2965,7 @@ void main_window_progress_off(MainWindow *mainwin)
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
 }
 
-static gboolean main_window_empty_trash(MainWindow *mainwin, gboolean confirm, gboolean for_quit)
+gboolean main_window_empty_trash(MainWindow *mainwin, gboolean confirm, gboolean for_quit)
 {
        if (confirm && procmsg_have_trashed_mails_fast()) {
                AlertValue val;

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7dbc8ace8c2eb8505e83e6cecd25d72c9c952eb3..22639cdbd836485e6817c49ae9c3309a06fa8bfd 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -177,6 +177,9 @@ void main_window_get_position               (MainWindow     *mainwin);
 
 void main_window_progress_on           (MainWindow     *mainwin);
 void main_window_progress_off          (MainWindow     *mainwin);
+gboolean main_window_empty_trash       (MainWindow     *mainwin,
+                                        gboolean        confirm,
+                                        gboolean        for_quit);
 
 void main_window_set_menu_sensitive    (MainWindow     *mainwin);
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 1889f56dcf04810d16504bcb98c63b4687a9c1f5..10e63b06173260eaf7de8242809f3d280066768c 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -583,6 +583,11 @@ static void trayicon_toggle_offline_cb( GtkAction *action, gpointer data )
 
 static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
+       if (prefs_common.clean_on_exit) {
+               if (!main_window_empty_trash(mainwin, prefs_common.ask_on_clean, TRUE))
+                       return;
+       }
+
        if (prefs_common.confirm_on_exit) {
                if (alertpanel(_("Exit"), _("Exit Claws Mail?"),
                               GTK_STOCK_CANCEL, GTK_STOCK_OK,