[Libreoffice-commits] core.git: vcl/inc

[Markus Mohrhard]

 vcl/inc/unx/fontmanager.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ec22318ccd93fffe60792a14c6d50c1672ef9428
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jul 15 18:51:36 2017 +0200

    the font installation code is now controlled by ENABLE_GIO
    
    Found by the random config linux tb.
    
    Change-Id: I86921dedb5c8bacc5131e6dd66df86cb028edaf3
    Reviewed-on: https://gerrit.libreoffice.org/40001
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 1c3114e43bbc..eaacd8072cae 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -35,7 +35,7 @@
 #include <vector>
 #include <unordered_map>
 
-#include "config_dbus.h"
+#include <config_gio.h>
 
 /*
  *  some words on metrics: every length returned by PrintFontManager and
@@ -202,12 +202,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     static void addFontconfigDir(const OString& rDirectory);
 
     std::set<OString> m_aPreviousLangSupportRequests;
-#if ENABLE_DBUS
+#if ENABLE_GIO
     std::vector<OString> m_aCurrentRequests;
 #endif
     Timer m_aFontInstallerTimer;
 
-#if ENABLE_DBUS
+#if ENABLE_GIO
     DECL_LINK( autoInstallFontLangSupport, Timer*, void );
 #endif
     PrintFontManager();