[pan2/testing: 232/279] misc cleanup

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

commit 5cd4639b26d1ef539f4951fc3615c522da53a7b1
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Mon Nov 7 15:12:26 2011 +0100

    misc cleanup

 pan/gui/actions.cc   |    2 +-
 pan/gui/gui.cc       |    5 +----
 pan/gui/pan.ui.h     |    2 ++
 pan/gui/post-ui.cc   |    2 +-
 pan/gui/task-pane.cc |    2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 72db18f..5b39311 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -637,7 +637,7 @@ namespace
   GtkToggleActionEntry toggle_entries[] =
   {
     { "thread-headers",           NULL, N_("_Thread Headers"),                NULL, NULL, G_CALLBACK(prefs_toggle_callback_impl), true },
-    { "wrap-article-body",        NULL, N_("_Wrap Article Body"),              "W", NULL, G_CALLBACK(prefs_toggle_callback_impl), false },
+    { "wrap-article-body",GTK_STOCK_JUSTIFY_FILL, N_("_Wrap Article Body"),    "W", NULL, G_CALLBACK(prefs_toggle_callback_impl), false },
     { "mute-quoted-text",         NULL, N_("Mute _Quoted Text"),               "Q", NULL, G_CALLBACK(prefs_toggle_callback_impl), true },
     { "show-all-headers",         NULL, N_("Show All _Headers in Body Pane"),  "H", NULL, G_CALLBACK(prefs_toggle_callback_impl), false },
     { "show-smilies-as-graphics", NULL, N_("Show _Smilies as Graphics"),      NULL, NULL, G_CALLBACK(prefs_toggle_callback_impl), true },
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 0cba10c..e1a89d5 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -352,9 +352,7 @@ GUI :: GUI (Data& data, Queue& queue, ArticleCache& cache, EncodeCache& encode_c
         on_queue_task_active_changed (queue, *(*it), true);
     }
   }
-#ifdef HAVE_OPENSSL
   _certstore.add_listener(this);
-#endif
 }
 
 namespace
@@ -365,9 +363,8 @@ namespace
 
 GUI :: ~GUI ()
 {
-#ifdef HAVE_OPENSSL
   _certstore.remove_listener(this);
-#endif
+
   const std::string accel_filename (get_accel_filename());
   gtk_accel_map_save (accel_filename.c_str());
   chmod (accel_filename.c_str(), 0600);
diff --git a/pan/gui/pan.ui.h b/pan/gui/pan.ui.h
index c09a505..82ec450 100644
--- a/pan/gui/pan.ui.h
+++ b/pan/gui/pan.ui.h
@@ -177,6 +177,8 @@ const char * fallback_ui_file =
 "    <toolitem action='match-only-binary-articles' />\n"
 "    <toolitem action='match-only-my-articles' />\n"
 "    <toolitem action='match-only-watched-articles' />\n"
+"    <separator />\n"
+"    <toolitem action='wrap-article-body' />\n"
 "  </toolbar>\n"
 "\n"
 "  <popup name='header-pane-popup'>\n"
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 77ec248..74feee7 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -408,7 +408,7 @@ namespace
   GtkActionEntry filequeue_popup_entries[] =
   {
 
-    { "remove-files", NULL,
+    { "remove-files", "Delete",
       N_("Remove from Queue"), "",
       N_("Remove from Queue"),
       G_CALLBACK(do_remove_files) },
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index b25e57d..98c2c80 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -640,7 +640,7 @@ namespace
       N_("Stop Task"),
       G_CALLBACK(do_stop) },
 
-    { "delete", NULL,
+    { "delete", "Delete",
       N_("Delete Task"), "",
       N_("Delete Task"),
       G_CALLBACK(do_delete) },