2009-05-21 [paul] 3.7.1cvs60
authorPaul Mangan <paul@claws-mail.org>
Thu, 21 May 2009 05:43:17 +0000 (05:43 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 21 May 2009 05:43:17 +0000 (05:43 +0000)
* src/mainwindow.c
* src/mainwindow.h
* src/plugins/trayicon/trayicon.c
when quitting from the trayicon, honour
prefs_common.clean_on_exit

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c
src/mainwindow.h
src/plugins/trayicon/trayicon.c

index 8286477..73c8972 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
index 882f66c..d8c896f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index e5d090d..ca2e4b3 100644 (file)
@@ -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=
 
index 5fabdb3..ff0be72 100644 (file)
@@ -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;
index 7dbc8ac..22639cd 100644 (file)
@@ -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);
 
index 1889f56..10e63b0 100644 (file)
@@ -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,