2006-12-04 [colin] 2.6.1cvs2

	* src/compose.c
		Run pre-send hook only when checking
		everything

diff --git a/ChangeLog b/ChangeLog
index c51b21611ad9041d91cd246a1f5526ece179d02d..c69286c1c37ed39b86757dda05e0a9cea0c32a77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-04 [colin]     2.6.1cvs2
+
+       * src/compose.c
+               Run pre-send hook only when checking
+               everything
+

 2006-12-04 [paul]      2.6.1cvs1
 
        * NEWS
 2006-12-04 [paul]      2.6.1cvs1
 
        * NEWS

diff --git a/PATCHSETS b/PATCHSETS
index bb55d9b421120e6be235b557f7738c07cfecba36..f87f952e239a3b66ac4644ab0bafe33db4129c68 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2109,3 +2109,4 @@
 ( cvs diff -u -r 1.36.2.91 -r 1.36.2.92 src/common/utils.c;  ) > 2.6.0cvs82.patchset
 ( cvs diff -u -r 1.8.2.26 -r 1.8.2.27 README;  ) > 2.6.0cvs83.patchset
 ( cvs diff -u -r 1.42.2.23 -r 1.42.2.24 NEWS;  cvs diff -u -r 1.8.2.27 -r 1.8.2.28 README;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 RELEASE_NOTES;  cvs diff -u -r 1.654.2.2163 -r 1.654.2.2164 configure.ac;  cvs diff -u -r 1.30.2.13 -r 1.30.2.14 tools/README;  ) > 2.6.1cvs1.patchset
 ( cvs diff -u -r 1.36.2.91 -r 1.36.2.92 src/common/utils.c;  ) > 2.6.0cvs82.patchset
 ( cvs diff -u -r 1.8.2.26 -r 1.8.2.27 README;  ) > 2.6.0cvs83.patchset
 ( cvs diff -u -r 1.42.2.23 -r 1.42.2.24 NEWS;  cvs diff -u -r 1.8.2.27 -r 1.8.2.28 README;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 RELEASE_NOTES;  cvs diff -u -r 1.654.2.2163 -r 1.654.2.2164 configure.ac;  cvs diff -u -r 1.30.2.13 -r 1.30.2.14 tools/README;  ) > 2.6.1cvs1.patchset

+( cvs diff -u -r 1.382.2.338 -r 1.382.2.339 src/compose.c;  ) > 2.6.1cvs2.patchset

diff --git a/configure.ac b/configure.ac
index 26a0154d778e3745053d623a88ca78661bb13ed9..a3ce560e2ba5288656e10520a0f7cfc9451453a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=1
+EXTRA_VERSION=2

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index fbd223408648dcac7a320744c56c6fa1d5dc413a..4608b04daee087c1fe6b9f0c1d037d92d4ba9f3e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -266,7 +266,7 @@ static PrefsAccount *compose_current_mail_account(void);
 static gboolean compose_check_for_valid_recipient
                                                (Compose        *compose);
 static gboolean compose_check_entries          (Compose        *compose,
 static gboolean compose_check_for_valid_recipient
                                                (Compose        *compose);
 static gboolean compose_check_entries          (Compose        *compose,

-                                                gboolean       check_subject);
+                                                gboolean       check_everything);

 static gint compose_write_to_file              (Compose        *compose,
                                                 FILE           *fp,
                                                 gint            action,
 static gint compose_write_to_file              (Compose        *compose,
                                                 FILE           *fp,
                                                 gint            action,


@@ -4207,7 +4207,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
        return TRUE;
 }
 
        return TRUE;
 }
 

-static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
+static gboolean compose_check_entries(Compose *compose, gboolean check_everything)

 {
        const gchar *str;
 
 {
        const gchar *str;
 


@@ -4225,7 +4225,7 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
 
        if (!compose->batch) {
                str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
 
        if (!compose->batch) {
                str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));

-               if (*str == '\0' && check_subject == TRUE) {
+               if (*str == '\0' && check_everything == TRUE) {

                        AlertValue aval;
 
                        aval = alertpanel(_("Send"),
                        AlertValue aval;
 
                        aval = alertpanel(_("Send"),


@@ -4236,7 +4236,7 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
                }
        }
 
                }
        }
 

-       if (hooks_invoke(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST, compose))
+       if (check_everything && hooks_invoke(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST, compose))

                return FALSE;
 
        return TRUE;
                return FALSE;
 
        return TRUE;