2006-01-15 [colin] 1.9.100cvs156

	* src/folderview.c
	* src/mainwindow.c
		Same for "Empty trash"

diff --git a/ChangeLog b/ChangeLog
index 7af970bbe668faa377c45656d8d68f2f04531e94..ba95703b23253be9e59fa00079f9438f5de1dbd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-15 [colin]     1.9.100cvs156
+
+       * src/folderview.c
+       * src/mainwindow.c
+               Same for "Empty trash"
+
 2006-01-15 [colin]     1.9.100cvs155
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index 0b3fd2ed2e86fc624c63611c541cf880f6f3c2b1..12c31076d5665023e45b935ec09fb8acf09ca52e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1139,3 +1139,4 @@
 ( cvs diff -u -r 1.213.2.75 -r 1.213.2.76 src/folder.c;  cvs diff -u -r 1.87.2.24 -r 1.87.2.25 src/folder.h;  cvs diff -u -r 1.115.2.73 -r 1.115.2.74 src/main.c;  ) > 1.9.100cvs153.patchset
 ( cvs diff -u -r 1.395.2.157 -r 1.395.2.158 src/summaryview.c;  ) > 1.9.100cvs154.patchset
 ( cvs diff -u -r 1.149.2.41 -r 1.149.2.42 src/inc.c;  ) > 1.9.100cvs155.patchset
+( cvs diff -u -r 1.207.2.84 -r 1.207.2.85 src/folderview.c;  cvs diff -u -r 1.274.2.90 -r 1.274.2.91 src/mainwindow.c;  ) > 1.9.100cvs156.patchset

diff --git a/configure.ac b/configure.ac
index 1448c2158b35777201191512c1db9ee21a035685..8ea087ad8cfb8cca0ceb0bc8461578be01b9f3be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=155
+EXTRA_VERSION=156
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 8650c6fdebba7cac1e45eaeb68df77005cfa8b91..91132fe79b6100d20601f6de092008a6a28531f0 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2053,7 +2053,7 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        if (prefs_common.ask_on_clean) {
                if (alertpanel(_("Empty trash"),
                               _("Delete all messages in trash?"),
-                              GTK_STOCK_CANCEL, _("_Empty trash"), NULL) != G_ALERTALTERNATE)
+                              GTK_STOCK_CANCEL, _("+_Empty trash"), NULL) != G_ALERTALTERNATE)
                        return;
        }
        

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 94b2d57cb07829a1f00014f2c41115c5a48ebc2b..0fa721bb7fa505f2e0b66d3b9cb1f70f2a8b58e8 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1720,7 +1720,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
        if (confirm) {
                if (alertpanel(_("Empty trash"),
                               _("Delete all messages in trash folders?"),
-                              GTK_STOCK_CANCEL, _("_Empty trash"), NULL)
+                              GTK_STOCK_CANCEL, _("+_Empty trash"), NULL)
                    != G_ALERTALTERNATE)
                        return;
                manage_window_focus_in(mainwin->window, NULL, NULL);