2007-09-03 [wwp] 3.0.0cvs3

	* src/compose.c
		Warn differently when sending or sending later (queueing).

diff --git a/ChangeLog b/ChangeLog
index 3fdc00d002737608ee34ec15c7bb044023584d0a..f07a3811326a615fe4837c357b8f561278347f81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-03 [wwp]       3.0.0cvs3
+
+       * src/compose.c
+               Warn differently when sending or sending later (queueing).
+
 2007-09-03 [colin]     3.0.0cvs2
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 4f64b8f3ee179fe191c8114025057c34eb322df0..3ec93a43ea072f8ec7835beeba64394e20dec6d1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2848,3 +2848,4 @@
 ( cvs diff -u -r 1.21.2.5 -r 1.21.2.6 po/bg.po;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 po/ca.po;  cvs diff -u -r 1.58.2.32 -r 1.58.2.33 po/de.po;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 po/fi.po;  cvs diff -u -r 1.42.2.32 -r 1.42.2.33 po/fr.po;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 po/hu.po;  cvs diff -u -r 1.34.2.22 -r 1.34.2.23 po/it.po;  cvs diff -u -r 1.10.2.13 -r 1.10.2.14 po/pl.po;  cvs diff -u -r 1.50.2.26 -r 1.50.2.27 po/pt_BR.po;  cvs diff -u -r 1.17.2.15 -r 1.17.2.16 po/ru.po;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 po/sk.po;  cvs diff -u -r 1.5.2.24 -r 1.5.2.25 po/zh_CN.po;  ) > 2.10.0cvs191.patchset
 ( cvs diff -u -r 1.60.2.45 -r 1.60.2.46 po/es.po;  cvs diff -u -r 1.9.2.41 -r 1.9.2.42 src/common/defs.h;  ) > 3.0.0cvs1.patchset
 ( cvs diff -u -r 1.49.2.96 -r 1.49.2.97 src/procmime.c;  cvs diff -u -r 1.17.2.19 -r 1.17.2.20 src/procmime.h;  cvs diff -u -r 1.13.2.29 -r 1.13.2.30 src/common/plugin.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/common/plugin.h;  ) > 3.0.0cvs2.patchset
+( cvs diff -u -r 1.382.2.406 -r 1.382.2.407 src/compose.c;  ) > 3.0.0cvs3.patchset

diff --git a/configure.ac b/configure.ac
index a8647ed70c240361eab277ae049ba860d81b56e2..1f1ac7f69d238eec931e8149010c2420c4fe1f17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 3cb9886f421d2274b62d4be4fab5a8140c301163..1d981130b0a26c43b61dad9cb026afb017bbd1ca 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4479,10 +4479,19 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_everythin
                if (*str == '\0' && check_everything == TRUE && 
                    compose->mode != COMPOSE_REDIRECT) {
                        AlertValue aval;
+                       gchar *button_label;
+                       gchar *message;
 
-                       aval = alertpanel(_("Send"),
-                                         _("Subject is empty. Send it anyway?"),
-                                         GTK_STOCK_CANCEL, _("+_Send"), NULL);
+                       if (compose->sending)
+                               button_label = _("+_Send");
+                       else
+                               button_label = _("+_Queue");
+                       message = g_strdup_printf(_("Subject is empty. %s it anyway?"),
+                                       compose->sending?_("Send"):_("Queue"));
+
+                       aval = alertpanel(compose->sending?_("Send"):_("Send later"), message,
+                                         GTK_STOCK_CANCEL, button_label, NULL);
+                       g_free(message);
                        if (aval != G_ALERTALTERNATE)
                                return FALSE;
                }