[pan2] - fixed a segfault in "change download location" - reverted html portion of mime-utils - changed ver

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

commit 33bc6c05d85c6c2b15b4c11e2bc8ecfbbabb7e2c
Author: Heinrich MÃller <henmull src gnome org>
Date:   Thu Feb 16 21:02:10 2012 +0100

    - fixed a segfault in "change download location"
    - reverted html portion of mime-utils
    - changed version to 0.136 (preparing for the next release)

 configure.in                   |    4 +-
 pan/gui/gui.cc                 |    2 +-
 pan/gui/task-pane.cc           |   18 ++++++----
 pan/usenet-utils/mime-utils.cc |   70 ++++++++++++++++++++--------------------
 4 files changed, 49 insertions(+), 45 deletions(-)
---
diff --git a/configure.in b/configure.in
index 22988f3..bed2cf8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-AC_INIT([Pan],[0.135],[https://bugzilla.gnome.org/enter_bug.cgi?product=Pan],[pan],[http://pan.rebelbase.com/])
+AC_INIT([Pan],[0.136],[https://bugzilla.gnome.org/enter_bug.cgi?product=Pan],[pan],[http://pan.rebelbase.com/])
 AC_DEFINE(VERSION_MAJOR,0,[Major part of version number])
 AC_DEFINE(VERSION_MINOR,135,[Minor part of version number])
 AC_DEFINE(VERSION_REVISION,0,[Revision part of version number])
-AC_DEFINE(VERSION_TITLE,["Tomorrow I'll Wake Up and Scald Myself with Tea"],[Release Name])
+AC_DEFINE(VERSION_TITLE,["I'm far too busy being delicious"],[Release Name])
 AC_PREREQ([2.64])
 
 dnl Expanded by export-archive
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 144fb63..2fbb765 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -1590,7 +1590,7 @@ void GUI :: do_about_pan ()
   gtk_about_dialog_set_program_name (w, _("Pan"));
   gtk_about_dialog_set_version (w, PACKAGE_VERSION);
   gtk_about_dialog_set_comments (w, VERSION_TITLE " (" GIT_REV "; " PLATFORM_INFO ")");
-  gtk_about_dialog_set_copyright (w, _("Copyright \u00A9 2002-2011 Charles Kerr and others")); // \u00A9 is unicode for (c)
+  gtk_about_dialog_set_copyright (w, _("Copyright \u00A9 2002-2012 Charles Kerr and others")); // \u00A9 is unicode for (c)
   gtk_about_dialog_set_website (w, "http://pan.rebelbase.com/";);
   gtk_about_dialog_set_logo (w, logo);
   gtk_about_dialog_set_license (w, LICENSE);
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index f686c04..6e3d46e 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -287,15 +287,19 @@ TaskPane :: change_destination (const tasks_t& tasks)
 {
 
   if (tasks.empty()) return;
+
   TaskArticle * t (dynamic_cast<TaskArticle*>(tasks[0]));
-  std::string new_path(prompt_user_for_new_dest(GTK_WINDOW(_root),t->get_save_path()));
-  if (new_path.empty()) return; // user cancelled/aborted
-  foreach_const (tasks_t, tasks, it) {
-    TaskArticle * task (dynamic_cast<TaskArticle*>(*it));
-    if (task)
-      task->set_save_path(Quark(new_path));
-  }
 
+  if (t)
+  {
+    std::string new_path(prompt_user_for_new_dest(GTK_WINDOW(_root),t->get_save_path()));
+    if (new_path.empty()) return; // user cancelled/aborted
+    foreach_const (tasks_t, tasks, it) {
+      TaskArticle * task (dynamic_cast<TaskArticle*>(*it));
+      if (task)
+        task->set_save_path(Quark(new_path));
+    }
+  }
 }
 
 void TaskPane :: change_dest_clicked_cb (GtkButton*, TaskPane* pane)
diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index 5909256..1ade4fa 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -324,17 +324,17 @@ namespace
              !yenc_parse_end_line (line, NULL, NULL, NULL, NULL);
    }
 
-   bool
-   html_is_beginning_line(const char *line)
-   {
-     return !strncmp (line, HTML_MARKER_BEGIN, HTML_MARKER_BEGIN_LEN) ;
-   }
-
-   bool
-   html_is_ending_line(const char *line)
-   {
-     return !strncmp (line, HTML_MARKER_END, HTML_MARKER_END_LEN) ;
-   }
+//   bool
+//   html_is_beginning_line(const char *line)
+//   {
+//     return !strncmp (line, HTML_MARKER_BEGIN, HTML_MARKER_BEGIN_LEN) ;
+//   }
+//
+//   bool
+//   html_is_ending_line(const char *line)
+//   {
+//     return !strncmp (line, HTML_MARKER_END, HTML_MARKER_END_LEN) ;
+//   }
 
 };
 
@@ -700,12 +700,12 @@ namespace pan
               yenc_looking_for_part_line = cur->y_part!=0;
             }
           }
-          else if (html_is_beginning_line (line_str))
-          {
-            found = true;
-            sub_begin = linestart_pos;
-
-          }
+//          else if (html_is_beginning_line (line_str))
+//          {
+//            found = true;
+//            sub_begin = linestart_pos;
+//
+//          }
           else if (state.uu_temp != NULL && is_uu_line(line_str, line_len) )
           {
             // continue an incomplete uu decode
@@ -796,24 +796,24 @@ namespace pan
           }
           break;
         }
-        case ENC_HTML:
-        {
-          if (html_is_ending_line (line_str))
-          {
-            GMimeStream * stream = g_mime_stream_substream (istream, sub_begin, linestart_pos+line_len);
-            apply_source_and_maybe_filter (cur, stream);
-            if( append_if_not_present (master, cur) )
-              append_if_not_present (appendme, cur);
-
-            cur = NULL;
-            type = ENC_PLAIN;
-          }
-          else
-          {
-            ++cur->valid_lines;
-          }
-          break;
-        }
+//        case ENC_HTML:
+//        {
+//          if (html_is_ending_line (line_str))
+//          {
+//            GMimeStream * stream = g_mime_stream_substream (istream, sub_begin, linestart_pos+line_len);
+//            apply_source_and_maybe_filter (cur, stream);
+//            if( append_if_not_present (master, cur) )
+//              append_if_not_present (appendme, cur);
+//
+//            cur = NULL;
+//            type = ENC_PLAIN;
+//          }
+//          else
+//          {
+//            ++cur->valid_lines;
+//          }
+//          break;
+//        }
       }
     }