[pan2/testing: 73/279] Merge branch 'experimental'

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

commit d19caec125f2a2968008b979a945e6a5d7d09458
Merge: 8fe83f5 308ac40
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Tue May 31 10:20:08 2011 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	pan/gui/gui.cc
    	pan/gui/post-ui.h
    	uulib/uuencode.c

 .gitattributes                                     |    1 +
 .gitignore                                         |   19 +
 README.windows                                     |   15 +
 pan/data-impl/data-impl.cc                         |    4 +-
 pan/data-impl/data-impl.h                          |   13 +
 pan/data-impl/groups.cc                            |    3 +
 pan/data-impl/headers.cc                           |   16 +-
 pan/data/decode-test-cache/apostrophe.msg          |   13 +
 pan/data/decode-test-cache/collision.msg           |   23 +
 pan/data/decode-test-cache/micro.msg               |   12 +
 pan/data/decode-test-cache/noisy_1_2.msg           |  668 +++++++++++
 pan/data/decode-test-cache/noisy_2_2.msg           |  124 ++
 pan/data/decode-test-cache/penguin_1_2.msg         |  332 ++++++
 pan/data/decode-test-cache/penguin_2_2.msg         |   41 +
 .../decode-test-cache/two_mime_attachments.msg     |  671 +++++++++++
 pan/data/decode-test-cache/two_uu_attachments.msg  |   18 +
 pan/data/decode-test-cache/xuuencode.msg           |  447 +++++++
 pan/data/decode-test-cache/yenc.msg                |  Bin 0 -> 2795 bytes
 pan/data/decode-test-cache/yenc_1_2.msg            |  103 ++
 pan/data/decode-test-cache/yenc_2_2.msg            |   78 ++
 pan/gui/Makefile.am                                |    1 +
 pan/gui/actions.cc                                 |    1 +
 pan/gui/body-pane.cc                               |   56 +-
 pan/gui/e-charset-combo-box.c                      |   10 +-
 pan/gui/e-charset-dialog.c                         |    2 +-
 pan/gui/group-pane.cc                              |    1 +
 pan/gui/group-prefs-dialog.cc                      |   22 +-
 pan/gui/gtk_compat.h                               |  118 ++
 pan/gui/gui.cc                                     |   22 +-
 pan/gui/gui.h                                      |    9 +-
 pan/gui/header-pane.cc                             |   27 +-
 pan/gui/pan.cc                                     |    7 +-
 pan/gui/pan.ui.h                                   |    4 +
 pan/gui/post-ui.cc                                 |   55 +-
 pan/gui/post-ui.h                                  |    3 +-
 pan/gui/post.ui.h                                  |    3 +-
 pan/gui/prefs-ui.cc                                |   30 +-
 pan/gui/profiles-dialog.cc                         |    6 +-
 pan/gui/save-ui.cc                                 |   10 +-
 pan/gui/score-add-ui.cc                            |    9 +-
 pan/gui/score-view-ui.cc                           |    3 +-
 pan/gui/score-view-ui.h                            |    2 +-
 pan/gui/server-ui.cc                               |    1 +
 pan/gui/task-pane.cc                               |    2 +-
 pan/gui/task-pane.h                                |    2 +-
 pan/tasks/decoder.cc                               |    4 +-
 pan/usenet-utils/text-massager-test.cc             |  645 ++++++-----
 pan/usenet-utils/text-massager.cc                  |  221 +++--
 pan/usenet-utils/text-massager.h                   |    4 +-
 pan/usenet-utils/url-find-test.cc                  |   19 +-
 pan/usenet-utils/url-find.cc                       |   65 +-
 po/da.po                                           |  436 ++++----
 po/de.po                                           | 1251 ++++++++++++++------
 uulib/uuencode.c                                   |  153 ++--
 54 files changed, 4671 insertions(+), 1134 deletions(-)
---
diff --cc pan/data-impl/data-impl.cc
index be96dae,9f6bc53..80a1442
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@@ -63,10 -54,11 +63,12 @@@ namespac
  DataImpl :: DataImpl (bool unit_test, int cache_megs, DataIO * io):
    ProfilesImpl (*io),
    _cache (get_cache_path(), cache_megs),
 +//  _encode_cache (get_encode_cache_path(), cache_megs),
    _unit_test (unit_test),
    _data_io (io),
-   _descriptions_loaded (false)
+   _descriptions_loaded (false),
+   newsrc_autosave_id (0),
+   newsrc_autosave_timeout (0)
  {
    rebuild_backend ();
  }
diff --cc pan/gui/gui.h
index e266ca7,4fe8a39..598e91f
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@@ -22,9 -22,8 +22,9 @@@
  #include <pan/general/log.h>
  #include <pan/general/progress.h>
  #include <pan/data/article-cache.h>
 +#include <pan/data/encode-cache.h>
  #include <pan/tasks/queue.h>
- #include <pan/gui/group-pane.h>
+ 
  #include <pan/gui/action-manager.h>
  #include <pan/gui/pan-ui.h>
  #include <pan/gui/prefs.h>
diff --cc pan/gui/post-ui.h
index 2f7d76b,af57c66..d219e92
--- a/pan/gui/post-ui.h
+++ b/pan/gui/post-ui.h
@@@ -45,10 -44,10 +45,10 @@@ namespace pa
    class PostUI: private Progress::Listener
    {
      public:
-       static PostUI* create_window (GtkWidget*, Data&, Queue&, GroupServer&, Profiles&,
+       static PostUI* create_window (GtkWindow*, Data&, Queue&, GroupServer&, Profiles&,
 -                                    GMimeMessage*, Prefs&, GroupPrefs&);
 +                                    GMimeMessage*, Prefs&, GroupPrefs&, ArticleCache&);
  
 -      void prompt_user_for_queueable_files (tasks_set& queue, GtkWindow * parent, const Prefs& prefs);
 +      void prompt_user_for_queueable_files (tasks_v& queue, GtkWindow * parent, const Prefs& prefs);
  
      protected:
        PostUI (GtkWindow*, Data&, Queue&, GroupServer&, Profiles&,