summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/fontmanager.hxx6
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx3
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx3
3 files changed, 8 insertions, 4 deletions
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 1fdf273700e3..d3658005a385 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -35,6 +35,8 @@
#include <vector>
+#include "config_dbus.h"
+
#define ATOM_FAMILYNAME 2
#define ATOM_PSNAME 3
@@ -315,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
static bool addFontconfigDir(const OString& rDirectory);
std::set<OString> m_aPreviousLangSupportRequests;
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
std::vector<OString> m_aCurrentRequests;
#endif
Timer m_aFontInstallerTimer;
-#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void );
#endif
PrintFontManager();
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 93aac14f7d29..ed34e3edca18 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -47,6 +47,7 @@
#include <list>
#include <vector>
+#include <config_dbus.h>
#include <config_gio.h>
#include "headless/svpgdi.hxx"
@@ -224,7 +225,7 @@ class GtkSalFrame : public SalFrame
SalMenu* m_pSalMenu;
-#if defined(ENABLE_DBUS) && ENABLE_GIO
+#if ENABLE_DBUS && ENABLE_GIO
public:
void EnsureDbusMenuSynced();
private:
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 3e827ff2b75c..405c635bdb83 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -10,6 +10,7 @@
#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
+#include <config_dbus.h>
#include <config_gio.h>
#include <vector>
@@ -20,7 +21,7 @@
#include <unx/salmenu.h>
#include <unx/gtk/gtkframe.hxx>
-#if defined(ENABLE_DBUS) && ENABLE_GIO && \
+#if ENABLE_DBUS && ENABLE_GIO && \
(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 36)
# define ENABLE_GMENU_INTEGRATION
# include <unx/gtk/glomenu.h>