[pan2: 5/8] intermediate .....

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

commit bce5599264eb70e59d5feb1857c381cd8f10e0fb
Author: Heinrich MÃller <henmull src gnome org>
Date:   Thu Dec 20 22:35:24 2012 +0100

    intermediate .....

 pan/gui/post-ui.cc             |    8 ++++----
 pan/gui/post-ui.h              |    2 +-
 pan/usenet-utils/mime-utils.cc |   18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 7976baa..2b10b89 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -1002,7 +1002,7 @@ PostUI :: save_message_in_local_folder(const Mode& mode, const std::string& fold
 {
 	  // the following message is constructed solely for the purpose of adding the current message to
 	  // a local folder of pan
-	  GMimeMessage* msg = new_message_from_ui(mode);
+	  GMimeMessage* msg = new_message_from_ui(VIRTUAL);
 	  Profile p(get_current_profile());
 
 	  //domain name
@@ -1032,11 +1032,12 @@ PostUI :: save_message_in_local_folder(const Mode& mode, const std::string& fold
 	  std::stringstream xref;
 	  xref << folder << ":42";
 
-	  const Article* article = _data.xover_add (p.posting_server, folder, subject, author, time(0), message_id, refs, sizeof(*msg), 42, xref.str(), true);
+    time_t posted = time(0);
+	  const Article* article = _data.xover_add (p.posting_server, folder, subject, author, posted, message_id, refs, sizeof(*msg), 42, xref.str(), true);
 	  // set adjusted time from article
 	  if (article)
 	  {
-		  g_mime_message_set_date(msg, article->time_posted, 0);
+		  g_mime_message_set_date(msg, posted, 0);
 		  ArticleCache& cache(_data.get_cache());
 		  ArticleCache :: CacheResponse response = cache.add(mid, g_mime_object_to_string(GMIME_OBJECT(msg)));
 		  g_object_unref(msg);
@@ -1638,7 +1639,6 @@ PostUI :: new_message_from_ui (Mode mode, bool copy_body)
       ? GNKSA::generate_message_id (profile.fqdn)
       : GNKSA::generate_message_id_from_email_address (profile.address);
     pan_g_mime_message_set_message_id (msg, message_id.c_str());
-
   }
 
   // body & charset
diff --git a/pan/gui/post-ui.h b/pan/gui/post-ui.h
index 84d8ee7..1855363 100644
--- a/pan/gui/post-ui.h
+++ b/pan/gui/post-ui.h
@@ -104,7 +104,7 @@ namespace pan
       void done_sending_message (GMimeMessage*, bool);
       void maybe_mail_message (GMimeMessage*);
       bool maybe_post_message (GMimeMessage*);
-      enum Mode { DRAFTING, POSTING, UPLOADING};
+      enum Mode { DRAFTING, POSTING, UPLOADING, VIRTUAL};
       bool save_message_in_local_folder(const Mode& mode, const std::string& folder);
 
     private:
diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index 158533b..1d48258 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -586,7 +586,7 @@ namespace pan
     temp_parts_t& master(state.master_list);
     temp_parts_t& appendme(state.current_list);
     TempPart * cur = NULL;
-    EncType type = et;
+    EncType enc_type = et;
     GByteArray * line;
     gboolean yenc_looking_for_part_line = FALSE;
     gint64 linestart_pos = 0;
@@ -609,7 +609,7 @@ namespace pan
         line_len = pch - line_str;
       }
 
-      switch (type)
+      switch (enc_type)
       {
 
 //        case ENC_QP:
@@ -649,7 +649,7 @@ namespace pan
             if (cur)
               g_free (filename);
             else
-              cur = new TempPart (type=ENC_UU, filename);
+              cur = new TempPart (enc_type=ENC_UU, filename);
             state.uu_temp = cur;
           }
           else if (yenc_is_beginning_line (line_str))
@@ -678,7 +678,7 @@ namespace pan
             }
             else
             {
-              cur = new TempPart (type=ENC_YENC, fname);
+              cur = new TempPart (enc_type=ENC_YENC, fname);
               cur->y_line_len = line_len;
               cur->y_attach_size = attach_size;
               cur->y_part = part;
@@ -701,12 +701,12 @@ namespace pan
             sub_begin = linestart_pos;
             cur = state.uu_temp;
             ++cur->valid_lines;
-            type = ENC_UU;
+            enc_type = ENC_UU;
           }
           else if (cur == NULL)
           {
             sub_begin = linestart_pos;
-            cur = new TempPart(type = type);
+            cur = new TempPart(enc_type);
 
           }
           break;
@@ -724,7 +724,7 @@ namespace pan
               append_if_not_present (appendme, cur);
 
             cur = NULL;
-            type = ENC_PLAIN;
+            enc_type = ENC_PLAIN;
             state.uu_temp = NULL;
           }
           else if (!is_uu_line(line_str, line_len))
@@ -761,7 +761,7 @@ namespace pan
               append_if_not_present (appendme, cur);
 
             cur = NULL;
-            type = ENC_PLAIN;
+            enc_type = ENC_PLAIN;
           }
           else if (yenc_looking_for_part_line && yenc_is_part_line(line_str))
           {
@@ -794,7 +794,7 @@ namespace pan
       if( append_if_not_present (master, cur) )
         append_if_not_present (appendme, cur);
       cur = NULL;
-      type = ENC_PLAIN;
+      enc_type = ENC_PLAIN;
 
     }