[pan2: 67/268] Merge branch 'pan2_master' into test

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

commit 855534f521e8cafd91bbd95d3a20bfa98f87f583
Merge: 796af32 b9bcc95
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Tue Jun 14 14:57:45 2011 +0200

    Merge branch 'pan2_master' into test
    
    Conflicts:
    	pan/gui/actions.cc
    	pan/gui/gtk_compat.h
    	pan/gui/gui.cc
    	pan/gui/gui.h
    	pan/gui/post-ui.cc
    	pan/gui/prefs-ui.cc
    	pan/tasks/nzb.h
    	pan/tasks/queue.h
    	pan/usenet-utils/text-massager-test.cc

 .gitignore                             |    3 +
 AUTHORS                                |   15 +-
 ChangeLog                              |   20 +
 Pan.ico                                |  Bin 2238 -> 2238 bytes
 README                                 |    2 +-
 configure.in                           |   18 +-
 pan/gui/actions.cc                     |    4 +-
 pan/gui/group-pane.cc                  |   23 +-
 pan/gui/group-prefs-dialog.cc          |    2 +-
 pan/gui/gtk_compat.h                   |    4 +-
 pan/gui/gui.cc                         |   34 +-
 pan/gui/gui.h                          |    2 +-
 pan/gui/post-ui.cc                     |    4 +-
 pan/gui/prefs-ui.cc                    |    6 +-
 pan/tasks/nzb.cc                       |   62 ++
 pan/usenet-utils/text-massager-test.cc |   76 ++-
 po/cs.po                               |  866 +++++++++---------
 po/da.po                               |  436 +++++-----
 po/de.po                               | 1570 +++++++++++---------------------
 po/es.po                               |  854 +++++++++---------
 po/sl.po                               |  908 ++++++++++---------
 21 files changed, 2334 insertions(+), 2575 deletions(-)
---
diff --cc pan/gui/gui.cc
index 78a9057,470c556..9c87c51
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@@ -63,9 -62,8 +63,10 @@@ extern "C" 
  #include "server-ui.h"
  #include "task-pane.h"
  #include "url.h"
+ #include "gtk_compat.h"
  
 +#include "profiles-dialog.h"
 +
  namespace pan
  {
    void
@@@ -597,12 -593,13 +598,13 @@@ void GUI :: do_save_articles_to_nzb (
        std::string emptystring;
        foreach_const (std::vector<Article>, copies, it)
          tasks.push_back (new TaskArticle (_data, _data, *it, _cache, _data, 0, TaskArticle::RAW,emptystring));
- 
-       // write them to a file
-       std::ofstream tmp(file.c_str());
-       if (tmp.good())
-         NZB :: nzb_to_xml_file (tmp, tasks);
-       tmp.close();
+     
+           // write them to a file
+           std::ofstream tmp(file.c_str());
+           if (tmp.good()) {
+             NZB :: nzb_to_xml_file (tmp, tasks); 
 -            tmp.close();
+           }
++          tmp.close ();
      }
  }
  
@@@ -1307,9 -1296,8 +1305,9 @@@ 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 };
+   const gchar * authors [] = { "Charles Kerr <charles rebelbase com> - Pan Author", "Calin Culianu <calin ajvar org> - Threaded Decoding", "K. Haley <haleykd users sf net> - Contributor", "Petr Kovar <pknbe volny cz> - Contributor", "Heinrich Mueller <eddie_v gmx de> - Contributor", "Christophe Lambin <chris rebelbase com> - Original Pan Development", "Matt Eagleson <matt rebelbase com> - Original Pan Development", 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);
 +//  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"));
    gtk_about_dialog_set_version (w, PACKAGE_VERSION);
diff --cc pan/usenet-utils/text-massager-test.cc
index 53c85f8,c64a3ef..fa5fcf3
--- a/pan/usenet-utils/text-massager-test.cc
+++ b/pan/usenet-utils/text-massager-test.cc
@@@ -245,6 -245,6 +245,72 @@@ void test_folding(
    g_assert_cmpstr( out.c_str(), ==, expected_out.c_str());
  }
  
++    ">> Knode is not for me\n"
++    ">>     Question: What are the alternative apps. to Knode - \n"
++    ">>     especially in \n"
++    ">>     off-line readers?\n"
++    "> \n"
++    "> I dunno any good kde newsreaders. I do like pan a lot. It's a gnome/gtk \n"
++    "> thing though. But if you don't care too much about a gtk \n"
++    "> thing in qyour \n"
++    "> kde-desktop, check out pan.\n"
++    "> \n"
++    "> Btw, you can let a kde-theme be applied to gtk programs too.  My gtk \n"
++    "> programs look just like kde, with it's default theme.\n"
++    "> \n"
++    "> \n"
++    "> --\n"
++    "> Marcel Pol mpol mpol dhs org\n"
++    "> \n"
++    "> ...my cow ate the CDs.\n"
++    "\n"
++    "Pan has been going through a lot of modifications recently so make sure \n"
++    "you get the latest version you can run \n"
++    "with your distro.\n";
++  expected_out =
++    "In article\n"
++    "<bl0D6 3171$Uo2 75315 zwoll1 home nl>,\n"
++    "\"Marcel Pol\"\n"
++    "<mpol nospam gmx net> wrote:\n"
++    "\n"
++    "> Recently \"Unknown\"\n"
++    "> <bill m no spam net> wrote:\n"
++    ">> Knode is not for me\n"
++    ">>     Question: What are the\n"
++    ">>     alternative apps. to\n"
++    ">>     Knode - especially in\n"
++    ">>     off-line readers?\n"
++    "> \n"
++    "> I dunno any good kde\n"
++    "> newsreaders. I do like pan a\n"
++    "> lot. It's a gnome/gtk thing\n"
++    "> though. But if you don't\n"
++    "> care too much about a gtk\n"
++    "> thing in qyour kde-desktop,\n"
++    "> check out pan.\n"
++    "> \n"
++    "> Btw, you can let a kde-theme\n"
++    "> be applied to gtk programs\n"
++    "> too.  My gtk programs look\n"
++    "> just like kde, with it's\n"
++    "> default theme.\n"
++    "> \n"
++    "> \n"
++    "> --\n"
++    "> Marcel Pol mpol mpol dhs org\n"
++    "> \n"
++    "> ...my cow ate the CDs.\n"
++    "\n"
++    "Pan has been going through a\n"
++    "lot of modifications recently\n"
++    "so make sure you get the\n"
++    "latest version you can run\n"
++    "with your distro.";
++  tm.set_wrap_column (30);
++  out = tm.fill (in, true);
++  g_assert_cmpstr( out.c_str(), ==, expected_out.c_str());
++}
++
  void test_rot13()
  {
     std::string in;
@@@ -421,13 -421,9 +487,13 @@@ void test_subj(
     g_assert_cmpstr( out.c_str(), ==, expected_out.c_str());
     in2 = "one - two three [1/2] - \"00 - title spaces.foo\" yEnc (1/5)";
     expected_out = "one_two_three";
 -   out = pan::subject_to_path(in2, sep);
 +   out = pan::subject_to_path(in2, false, sep);
     g_assert_cmpstr( out.c_str(), ==, expected_out.c_str());
-    in2 = "one - two three [1/2] - \"00 - title spaces.foo\" yEnc (1/5)";
-    expected_out = "one_two_three_[1_2]_00_title_spaces.foo_yEnc_(1_5)";
-    out = pan::subject_to_path(in2, true, sep);
-    g_assert_cmpstr( out.c_str(), ==, expected_out.c_str());
--}
++   check(out == expected_out);
++   in2 = "one - two three [1/2] - \"00 - title spaces.foo\" (/5)";
++   expected_out = "one_two_three";
++   out = pan::subject_to_path(in2, sep);
++   //std::cout<<"input: '"<<in2<<"'\noutput: '"<<out<<"'\n"<<std::endl;
  
  int main (int argc, char **argv)
  {