[pan2/testing: 149/279] Merge branch 'experimental' (back)

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

commit b07958370e03952c040be11c189323d5bd770885
Merge: f5f4e35 0f0b6b6
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Mon Jul 4 14:06:39 2011 +0200

    Merge branch 'experimental' (back)
    
    Conflicts:
    	pan/tasks/encoder.cc
    	pan/tasks/task-upload.cc

 pan.cbp                       |    2 +
 pan/data/encode-cache.cc      |   12 +-
 pan/gui/Makefile.am           |    2 +-
 pan/gui/gui.h                 |    2 +
 pan/gui/post-ui.cc            |  172 ++++++++++++++++++-------
 pan/gui/post-ui.h             |   19 ++--
 pan/tasks/encoder.cc          |   13 +--
 pan/tasks/nzb.cc              |  280 ++++++++++++++++++++++++-----------------
 pan/tasks/nzb.h               |    3 +
 pan/tasks/queue.cc            |   53 +++++++-
 pan/tasks/queue.h             |    6 +
 pan/tasks/task-upload.cc      |   37 ++++--
 pan/tasks/task-upload.h       |   14 ++-
 pan/tasks/task.h              |    7 +-
 pan/tasks/upload-queue.cc     |    2 +-
 pan/usenet-utils/Makefile.am  |    7 +-
 pan/usenet-utils/mime-utils.h |    3 +
 uulib/uudeview.h              |    3 +-
 uulib/uuencode.c              |    6 +-
 uulib/uunconc.c               |   35 +++---
 20 files changed, 445 insertions(+), 233 deletions(-)
---
diff --cc pan/tasks/encoder.cc
index 3aeadc3,4fbef63..f42e349
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@@ -156,8 -154,7 +154,7 @@@ Encoder :: do_work(
          continue;
        }
  
-       crc32_t unused;
-       res = UUEncodePartial (fp, NULL, (char*)filename.c_str(), enc , (char*)basename.c_str(), NULL, 0644, cnt, lpf, &unused);
 -      res = UUEncodePartial (fp, NULL, (char*)filename.c_str(), enc , (char*)basename.c_str(), 0, 0, cnt, lpf, &crc);
++      res = UUEncodePartial (fp, NULL, (char*)filename.c_str(), enc , (char*)basename.c_str(), NULL, 0644, cnt, lpf,&crc);
  
        if (fp) fclose(fp);
  _no_encode:
diff --cc pan/tasks/task-upload.cc
index 7e58546,32db857..bb5af75
--- a/pan/tasks/task-upload.cc
+++ b/pan/tasks/task-upload.cc
@@@ -343,7 -358,7 +358,8 @@@ TaskUpload :: use_encoder (Encoder* enc
    init_steps(100);
    _state.set_working();
  
-   _encoder->enqueue (this, &_cache, &_article, _filename, _basename, _master_subject, 5000, YENC);
++//  _encoder->enqueue (this, &_cache, &_article, _filename, _basename, _master_subject, 5000, YENC);
+   _encoder->enqueue (this, &_cache, &_article, _filename, _basename, _master_subject, _lpf, _encode_mode);
    debug ("encoder thread was free, enqueued work");
  }