[pan: 5/15] Small cleanups after looking at PR

[Dominique Dumont <ddumont src gnome org>]

commit e0bf90976ce1e6855e3cd9e39127a5fbf660bbef
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Tue May 31 18:19:48 2022 +0100

    Small cleanups after looking at PR

 pan/gui/gui.cc     | 7 +------
 pan/gui/gui.h      | 1 -
 pan/gui/post-ui.cc | 4 ++--
 3 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 0d58975..c4471ae 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -30,12 +30,8 @@ extern "C" {
 #include <glib/gi18n.h>
 #include <pan/general/debug.h>
 #include <pan/general/e-util.h>
-/**/
-#include <memory>
 #include <pan/general/editor-spawner.h>
 #include <pan/general/file-util.h>
-/**/
-#include <pan/general/file-util.h>
 #include <pan/general/macros.h>
 #include <pan/usenet-utils/scorefile.h>
 #include <pan/usenet-utils/mime-utils.h>
@@ -78,7 +74,6 @@ extern "C" {
 
 #include <pan/usenet-utils/gpg.h>
 
-
 namespace
 {
   std::string get_accel_filename () {
@@ -2422,7 +2417,6 @@ GUI :: edit_scores_cleanup(int status, char *filename)
   gtk_window_present(get_window(_root));
 }
 
-
 #ifdef HAVE_GNUTLS
 
 void
@@ -2475,4 +2469,5 @@ GUI :: on_valid_cert_added (gnutls_x509_crt_t cert, std::string server)
   debug_SSL("whitelist ("<<server<<") ("<<cert<<")");
 }
 
+
 #endif
diff --git a/pan/gui/gui.h b/pan/gui/gui.h
index b2815cb..1388568 100644
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@ -199,7 +199,6 @@ namespace pan
       virtual void do_subscribe_selected_groups ();
       virtual void do_unsubscribe_selected_groups ();
       virtual void do_edit_scores(GtkAction *);
-
 #ifdef HAVE_GNUTLS
       void do_show_cert_failed_dialog(VerifyData* data);
       bool confirm_accept_new_cert_dialog(GtkWindow*, gnutls_x509_crt_t, const Quark&);
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 2983a16..97d8674 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -1389,10 +1389,10 @@ PostUI::spawn_editor_dead(int status, char *fname)
       gtk_text_buffer_insert(buf, &start, txt.c_str(), txt.size());
     }
 
-    // cleanup
-    ::remove(fname);
   }
 
+  // cleanup
+  ::remove(fname);
   g_free(fname);
 
   gtk_window_present(GTK_WINDOW(root()));