[pan2/testing: 95/279] quick bugfix

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

commit 17db483b1d82a98d794c08175407302a7508072e
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Wed Jun 8 15:17:03 2011 +0200

    quick bugfix

 pan/gui/gui.cc           |    3 ++-
 pan/gui/prefs-ui.cc      |    2 --
 pan/tasks/task-upload.cc |   10 +++-------
 uulib/uuencode.c         |    4 +++-
 4 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 1ac33ea..659c5bd 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -1310,7 +1310,8 @@ void GUI :: do_tip_jar ()
 void GUI :: do_about_pan ()
 {
   const gchar * authors [] = { "Charles Kerr <charles rebelbase com>", "Calin Culianu <calin ajvar org> - Threaded Decoding", 0 };
-//////  GdkPixbuf * logo = gdk_pixbuf_new_from_inline(-1, icon_pan_about_logo, 0, 0);
+  //  GdkPixbuf * logo = gdk_pixbuf_new_from_inline(-1, icon_pan_about_logo, 0, 0);
+  // imhotep : new logo, try it :D (source is at pan/icons)
   GdkPixbuf * logo = gdk_pixbuf_new_from_inline(-1, icon_pan_about_logo_new, 0, 0);
   GtkAboutDialog * w (GTK_ABOUT_DIALOG (gtk_about_dialog_new ()));
   gtk_about_dialog_set_program_name (w, _("Pan"));
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index a722db7..0646436 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -617,8 +617,6 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
   w = new_check_button (_("Always save article _information from Uploads to a file"), "upload-queue-save-enabled", false, prefs);
   HIG :: workarea_add_wide_control (t, &row, w);
   HIG :: workarea_add_section_title (t, &row, _("Upload Subject Line Appearance"));
-  w = new_check_button (_("Append [_partof/total parts] style counter"), "upload-queue-append-partcounter-enabled", false, prefs);
-  HIG :: workarea_add_wide_control (t, &row, w);
   w = new_check_button (_("Append su_bject for all posts"), "upload-queue-append-subject-enabled", false, prefs);
   HIG :: workarea_add_wide_control (t, &row, w);
   HIG :: workarea_finish (t, &row);
diff --git a/pan/tasks/task-upload.cc b/pan/tasks/task-upload.cc
index c261c2b..92472e0 100644
--- a/pan/tasks/task-upload.cc
+++ b/pan/tasks/task-upload.cc
@@ -357,15 +357,11 @@ TaskUpload :: use_encoder (Encoder* encoder)
   /* build format string */
   std::stringstream format_s;
   format_s << (_format.comment1 ? _subject : "");
-  format_s << " \"%s\" yEnc "; // will be filled in by uuencode
-  format_s << " (%d/%d) ";     // will be filled in by uuencode
-  std::stringstream counter;
-  counter <<"[" << _queue_pos << "/" << _queue_length << "]";
-  format_s << (_format.counter ? counter.str() : "");
+  format_s << " - \"%s\""; // will be filled in by uuencode
+  format_s << " (%d/%d) yEnc";     // will be filled in by uuencode
   std::string format(format_s.str());
-
   _encoder->enqueue (this, &_cache, _article, _filename, _basename,
-                     groups, _subject, _author, format, _domain, YENC);
+                     groups, _subject, _author, format , _domain, YENC);
   debug ("encoder thread was free, enqueued work");
 }
 
diff --git a/uulib/uuencode.c b/uulib/uuencode.c
index 7053b09..fd0e59c 100644
--- a/uulib/uuencode.c
+++ b/uulib/uuencode.c
@@ -1569,6 +1569,7 @@ UUE_PrepSingleExt (FILE *outfile, FILE *infile,
 
   fprintf (outfile, "Subject: %s%s", subline, eolstring);
 
+  // pan change (imhotep) : add unique mid for saving the upload queue to hdd
   if (mid)
   {
     fprintf(outfile, "Message-ID: <%s>%s", mid, eolstring);
@@ -1735,7 +1736,7 @@ UUE_PrepPartialExt (FILE *outfile, FILE *infile,
   }
 
 
-  // [subject] "filename" yEnc (partnum/numparts) [size] [part/of]
+  // [subject] - "filename" (partnum/numparts) yEnc
   if (encoding == YENC_ENCODED) {
     if (partno == 1)
       crc = crc32(0L, Z_NULL, 0);
@@ -1766,6 +1767,7 @@ UUE_PrepPartialExt (FILE *outfile, FILE *infile,
 
   fprintf (outfile, "Subject: %s%s", subline, eolstring);
 
+  // pan change (imhotep) : add unique mid for saving the upload queue to hdd
   if (mid)
   {
     fprintf(outfile, "Message-ID: <%s>%s", mid, eolstring);