[pan2] https://bugzilla.gnome.org/show_bug.cgi?id=693786

[Heinrich MÃller <henmull src gnome org>]

commit f509257f8a8302654eacaa10c1a8f17f2f3464c0
Author: Heinrich MÃller <henmull src gnome org>
Date:   Thu Feb 14 20:05:51 2013 +0100

    https://bugzilla.gnome.org/show_bug.cgi?id=693786

 pan/gui/post-ui.cc     |    5 ++---
 pan/tasks/nntp.cc      |    1 -
 pan/tasks/task-post.cc |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 788fea8..73381b4 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -1224,9 +1224,8 @@ PostUI :: maybe_post_message (GMimeMessage * message)
       {
         if (custom_mid)
         {
-            std::string out (generate_message_id(p));
-            n.mid = out;
-            if (first_mid.empty()) first_mid = out;
+            n.mid = generate_message_id(p);
+            if (first_mid.empty()) first_mid = n.mid;
         }
 
         g_snprintf(buf,sizeof(buf),"%s.%d", basename, *pit);
diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc
index 7c434a6..b1433c9 100644
--- a/pan/tasks/nntp.cc
+++ b/pan/tasks/nntp.cc
@@ -216,7 +216,6 @@ NNTP :: on_socket_response (Socket * sock UNUSED, const StringView& line_in)
         case GROUP_NONEXISTENT:
            state = CMD_FAIL;
            break;
-
         case XOVER_FOLLOWS:
         case ARTICLE_FOLLOWS:
         case NEWGROUPS_FOLLOWS:
diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc
index eb8576b..25cfdf8 100644
--- a/pan/tasks/task-post.cc
+++ b/pan/tasks/task-post.cc
@@ -71,7 +71,7 @@ TaskPost :: on_nntp_done (NNTP              * nntp,
 
   const char* res(g_mime_message_get_subject(_message));
 
-  if (health == ERR_NETWORK)
+  if (health == ERR_NETWORK || health == ERR_COMMAND)
   {
     Log :: add_err_va (_("Posting of \"%s\" failed: %s"),
                           res, response.str);