2006-04-14 [wwp] 2.1.0cvs46

	* src/send_message.c
		enforce a check for domain in account prefs (a sending
		error could be faced if domain was checked but no value set),
		thanks to Colin.

diff --git a/ChangeLog b/ChangeLog
index e5c9dda8c520049f710364860b7cd845045116bc..173fc7095a6c1f41a4b4f76e85baeffa58277e3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-14 [wwp]       2.1.0cvs46
+
+       * src/send_message.c
+               enforce a check for domain in account prefs (a sending
+               error could be faced if domain was checked but no value set),
+               thanks to Colin.
+
 2006-04-14 [colin]     2.1.0cvs45
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 8d974691468b91b2aa0d68ed5eaf508a3bee4e13..df399c08e2fd99bff37dfe481c7775c531000ccf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1417,3 +1417,4 @@
 ( cvs diff -u -r 1.23.2.16 -r 1.23.2.17 src/crash.c;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/gtk/about.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/authors.h;  ) > 2.1.0cvs43.patchset
 ( cvs diff -u -r 1.382.2.263 -r 1.382.2.264 src/compose.c;  ) > 2.1.0cvs44.patchset
 ( cvs diff -u -r 1.65.2.47 -r 1.65.2.48 src/codeconv.c;  ) > 2.1.0cvs45.patchset
+( cvs diff -u -r 1.17.2.26 -r 1.17.2.27 src/send_message.c;  ) > 2.1.0cvs46.patchset

diff --git a/configure.ac b/configure.ac
index 31ee3bebda4a07fca3926bc5fa8ec677b78580af..5145c3645f5770f02dd89046c6839674090afc35 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/send_message.c b/src/send_message.c
index 790dfd52fbf703aa795e5e9717a261629db41b01..927e263f9bb9bebe99aa00ea22984fd3f7153268 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -214,8 +214,11 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                session = smtp_session_new();
                smtp_session = SMTP_SESSION(session);
 
-               smtp_session->hostname =
-                       ac_prefs->set_domain ? g_strdup(ac_prefs->domain) : NULL;
+               if (ac_prefs->set_domain && ac_prefs->domain && strlen(ac_prefs->domain)) {
+                       smtp_session->hostname = g_strdup(ac_prefs->domain);
+               } else {
+                       smtp_session->hostname = NULL;
+               }
 
                if (ac_prefs->use_smtp_auth) {
                        smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;