[pan2/testing: 161/279] forgot to empty cache

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

commit ae1afa63d241bbb1a5fb81241ad50647bccc1172
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Fri Jul 8 13:17:39 2011 +0200

    forgot to empty cache

 pan/tasks/task-upload.cc |    5 +++--
 pan/tasks/task-upload.h  |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/pan/tasks/task-upload.cc b/pan/tasks/task-upload.cc
index bc1b081..5dd7c7c 100644
--- a/pan/tasks/task-upload.cc
+++ b/pan/tasks/task-upload.cc
@@ -338,6 +338,7 @@ TaskUpload :: on_nntp_done (NNTP * nntp,
 unsigned long
 TaskUpload :: get_bytes_remaining () const
 {
+  if (_needed.empty()) return _bytes*1.15;
   unsigned long bytes (0);
   foreach_const (needed_t, _needed, it)
     bytes += (unsigned long)it->second.bytes;
@@ -414,6 +415,6 @@ TaskUpload :: ~TaskUpload ()
       _encoder->cancel_silently();
 
   g_object_unref (G_OBJECT(_msg));
-//  _cache.release(_mids);
-//  _cache.resize();
+  _cache.release(_mids);
+  _cache.resize();
 }
diff --git a/pan/tasks/task-upload.h b/pan/tasks/task-upload.h
index 4b65b67..b685e7b 100644
--- a/pan/tasks/task-upload.h
+++ b/pan/tasks/task-upload.h
@@ -73,7 +73,7 @@ namespace pan
         int partno;
         NNTP* nntp;
         std::string message_id;
-        std::string mid, last_mid; // for rng
+        std::string mid; // for rng
         std::string cachename;
         Xref xref;
         bool encoded;