2006-10-17 [wwp] 2.5.5cvs13

	* src/send_message.c
		Fix duplicate error messages when sending, and missing
		newline in such error messages.

diff --git a/ChangeLog b/ChangeLog
index 7628b4e223e5e9d21fdb3b18ce571a4bf1b80759..d4f7beafc188f5deddd8d7417f9e63f4828b82c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-17 [wwp]       2.5.5cvs13
+
+       * src/send_message.c
+               Fix duplicate error messages when sending, and missing
+               newline in such error messages.
+
 2006-10-17 [colin]     2.5.5cvs12
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0c137ccba4b96a960c9e856f286206a8d69a0449..7953f3678a65590ca0bd136aa62a15c30e34938a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1998,3 +1998,4 @@
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/pgp_viewer.c;  ) > 2.5.5cvs10.patchset
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.5cvs11.patchset
 ( cvs diff -u -r 1.382.2.315 -r 1.382.2.316 src/compose.c;  ) > 2.5.5cvs12.patchset
+( cvs diff -u -r 1.17.2.34 -r 1.17.2.35 src/send_message.c;  ) > 2.5.5cvs13.patchset

diff --git a/configure.ac b/configure.ac
index d030c855d767c14bd3c5b6e17b149da46405263a..e7f463e728aa2d7ec0628cc2676b0edc715e7181 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/send_message.c b/src/send_message.c
index 065396713936823e7ee07491f1ff1e1f28d6f3ba..6db9a1d96718b20894f45c3f4fa65387cbd282c0 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -647,11 +647,12 @@ static void send_put_error(Session *session)
                break;
        }
 
-       if (log_msg)
-               log_warning("%s\n", log_msg);
        if (err_msg) {
-               log_error("%s", err_msg);
+               log_error("%s\n", err_msg);
                g_free(err_msg);
+       } else {
+               if (log_msg)
+                       log_warning("%s\n", log_msg);
        }
 }