[pan: 1/15] Rationalise the .gui.h files
- From: Dominique Dumont <ddumont src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan: 1/15] Rationalise the .gui.h files
- Date: Sun, 12 Jun 2022 09:12:11 +0000 (UTC)
commit 8b80884c50b1b278f4dcb737f172c15037383a79
Author: Thomas Tanner <thosrtanner googlemail com>
Date: Sat May 28 12:45:48 2022 +0100
Rationalise the .gui.h files
pan/gui/Makefile.am | 1 -
pan/gui/gui.cc | 6 +-
pan/gui/pan.ui.h | 3 +
pan/gui/pan.ui.ssl.h | 248 ---------------------------------------------------
4 files changed, 4 insertions(+), 254 deletions(-)
---
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index 50f5743..b2d1d82 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -63,7 +63,6 @@ noinst_HEADERS = \
pan-tree.h \
pan-ui.h \
pan.ui.h \
- pan.ui.ssl.h \
prefs.h \
prefs-file.h \
prefs-ui.h \
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 0af968b..23629a9 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -54,11 +54,7 @@ extern "C" {
#include "gui.h"
#include "pad.h"
-#ifdef HAVE_GNUTLS
- #include "pan.ui.ssl.h"
-#else
- #include "pan.ui.h"
-#endif
+#include "pan.ui.h"
#include "prefs-ui.h"
#include "progress-view.h"
diff --git a/pan/gui/pan.ui.h b/pan/gui/pan.ui.h
index 8133d85..438abdc 100644
--- a/pan/gui/pan.ui.h
+++ b/pan/gui/pan.ui.h
@@ -20,6 +20,9 @@ const char * fallback_ui_file =
" <menuitem action='select-article-body' />\n"
" <separator />\n"
" <menuitem action='show-servers-dialog' />\n"
+#ifdef HAVE_GNUTLS
+" <menuitem action='show-sec-dialog' />\n"
+#endif
" <menuitem action='show-profiles-dialog' />\n"
" <menuitem action='show-preferences-dialog' />\n"
" <menuitem action='show-group-preferences-dialog' />\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]