[gnome-terminal] nautilus: Don't include gdk headers in the nautilus extension
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] nautilus: Don't include gdk headers in the nautilus extension
- Date: Tue, 13 Sep 2022 18:50:35 +0000 (UTC)
commit 614ea99b16fb09e10341fc6ccf5e115ac3f93caf
Author: Christian Persch <chpe src gnome org>
Date: Tue Sep 13 20:49:54 2022 +0200
nautilus: Don't include gdk headers in the nautilus extension
https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916
(cherry picked from commit 388d8d2c1ed87c6dcf60e22c2da1482b9cbafd5d)
src/meson.build | 1 +
src/terminal-client-utils.cc | 6 ++++++
2 files changed, 7 insertions(+)
---
diff --git a/src/meson.build b/src/meson.build
index bd936f08..109ad093 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -433,6 +433,7 @@ if get_option('nautilus_extension')
]
nautilus_cxxflags = glib_version_cxxflags + [
+ '-DTERMINAL_NAUTILUS',
'-DTERM_LOCALEDIR="@0@"'.format(gt_prefix / gt_localedir),
]
diff --git a/src/terminal-client-utils.cc b/src/terminal-client-utils.cc
index ef8553bd..fbe85d2f 100644
--- a/src/terminal-client-utils.cc
+++ b/src/terminal-client-utils.cc
@@ -35,10 +35,12 @@
#include <gio/gio.h>
+#ifndef TERMINAL_NAUTILUS
#include <gdk/gdk.h>
#if defined(TERMINAL_COMPILATION) && defined(GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
#endif
+#endif
#ifdef ENABLE_DEBUG
@@ -370,6 +372,8 @@ terminal_client_append_exec_options (GVariantBuilder *builder,
}
}
+#ifndef TERMINAL_NAUTILUS
+
/**
* terminal_client_get_fallback_startup_id:
*
@@ -434,3 +438,5 @@ out:
#endif
return nullptr;
}
+
+#endif /* !TERMINAL_NAUTILUS */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]