[pan: 1/9] Remove another .gui.h file and use #ifdef in the file




commit 574bd07ac5cb44a309f17be8d0fabf5fcb927918
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Sun Jun 12 19:58:42 2022 +0100

    Remove another .gui.h file and use #ifdef in the file

 pan/gui/Makefile.am   |  1 -
 pan/gui/post-ui.cc    |  6 +----
 pan/gui/post.ui.h     |  5 ++++
 pan/gui/post.ui.pgp.h | 67 ---------------------------------------------------
 4 files changed, 6 insertions(+), 73 deletions(-)
---
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index b2d1d82..be30132 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -68,7 +68,6 @@ noinst_HEADERS = \
  prefs-ui.h \
  post-ui.h \
  post.ui.h \
- post.ui.pgp.h \
  profiles-dialog.h \
  progress-view.h \
  render-bytes.h \
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 68bad77..192a7a7 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -52,11 +52,7 @@ extern "C" {
 #include "pad.h"
 #include "hig.h"
 #include "post-ui.h"
-#ifdef HAVE_GMIME_CRYPTO
-  #include "post.ui.pgp.h"
-#else
-  #include "post.ui.h"
-#endif
+#include "post.ui.h"
 #include "profiles-dialog.h"
 #include "url.h"
 #include "gtk-compat.h"
diff --git a/pan/gui/post.ui.h b/pan/gui/post.ui.h
index 7e8f1a0..ffd5ba1 100644
--- a/pan/gui/post.ui.h
+++ b/pan/gui/post.ui.h
@@ -23,6 +23,11 @@ const char * fallback_post_ui =
 "      <separator />\n"
 "      <menuitem action='master-reply' />\n"
 "      <separator />\n"
+#ifdef HAVE_GMIME_CRYPTO
+"      <menuitem action='gpg-encrypt' />\n"
+"      <menuitem action='gpg-sign' />\n"
+"      <separator />\n"
+#endif
 "      <menuitem action='run-editor' />\n"
 "      <menuitem action='always-run-editor' />\n"
 "      <separator />\n"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]