talons

commit eb6b2e08e98e44003ad25a8abfc3b8e9373a88b8
parent e11caf622eba45a1561f480f1a6766b2a6aa1c37
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 19 May 2008 16:38:58 +0000

2008-05-19 [colin]	3.4.0cvs52

	* src/mainwindow.c
		Fix bug 1616, 'strange question while emptying trash'

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
3
++-
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
15
+++++++++++----

4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-19 [colin]	3.4.0cvs52
+
+	* src/mainwindow.c
+		Fix bug 1616, 'strange question while emptying trash'
+
 2008-05-18 [colin]	3.4.0cvs51
 
 	* src/common/plugin.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3346,4 +3346,5 @@
 ( cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/prefs_summaries.c;  cvs diff -u -r 1.395.2.367 -r 1.395.2.368 src/summaryview.c;  ) > 3.4.0cvs48.patchset
 ( cvs diff -u -r 1.25.2.54 -r 1.25.2.55 src/stock_pixmap.c;  ) > 3.4.0cvs49.patchset
 ( cvs diff -u -r 1.83.2.130 -r 1.83.2.131 src/mimeview.c;  cvs diff -u -r 1.10.2.15 -r 1.10.2.16 src/privacy.h;  cvs diff -u -r 1.43.2.98 -r 1.43.2.99 src/toolbar.c;  cvs diff -u -r 1.19.2.26 -r 1.19.2.27 src/toolbar.h;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/plugins/pgpcore/sgpgme.c;  ) > 3.4.0cvs50.patchset
-( cvs diff -u -r 1.13.2.34 -r 1.13.2.35 src/common/plugin.c;  cvs diff -u -r 1.1.4.100 -r 1.1.4.101 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/etpan/nntp-thread.c;  cvs diff -u -r 1.1.4.44 -r 1.1.4.45 src/gtk/gtksctree.c;  cvs diff -u -r 1.14.2.62 -r 1.14.2.63 src/plugins/trayicon/trayicon.c;  ) > 3.4.0cvs51.patchset
+( cvs diff -u -r 1.13.2.34 -r 1.13.2.35 src/common/plugin.c;  cvs diff -u -r 1.1.4.100 -r 1.1.4.101 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/etpan/nntp-thread.c;  cvs diff -u -r 1.1.4.44 -r 1.1.4.45 src/gtk/gtksctree.c; ) > 3.4.0cvs51.patchset
+( cvs diff -u -r 1.274.2.241 -r 1.274.2.242 src/mainwindow.c;  ) > 3.4.0cvs52.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=51
+EXTRA_VERSION=52
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2585,12 +2585,19 @@ 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)
+static gboolean main_window_empty_trash(MainWindow *mainwin, gboolean confirm, gboolean for_quit)
 {
 	if (confirm && procmsg_have_trashed_mails_fast()) {
-		AlertValue val = alertpanel(_("Empty trash"),
+		AlertValue val;
+		
+		if (for_quit)
+			val = alertpanel(_("Empty trash"),
 			       _("Delete all messages in trash folders?"),
 			       GTK_STOCK_NO, "+" GTK_STOCK_YES, _("Don't quit"));
+		else
+			val = alertpanel(_("Empty trash"),
+			       _("Delete all messages in trash folders?"),
+			       GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
 		if (val == G_ALERTALTERNATE) {
 			debug_print("will empty trash\n");
 		} else if (val == G_ALERTDEFAULT) {
@@ -3579,7 +3586,7 @@ static void export_list_mbox_cb(MainWindow *mainwin, guint action,
 static void empty_trash_cb(MainWindow *mainwin, guint action,
 			   GtkWidget *widget)
 {
-	main_window_empty_trash(mainwin, TRUE);
+	main_window_empty_trash(mainwin, TRUE, FALSE);
 }
 
 static void save_as_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
@@ -3608,7 +3615,7 @@ static void page_setup_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 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))
+		if (!main_window_empty_trash(mainwin, prefs_common.ask_on_clean, TRUE))
 			return;
 	}