diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 11:59:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 16:34:57 +0000 |
| commit | f2984e95740cfbb9c74574f2a1225af3411d4901 (patch) | |
| tree | 6d664743ceb58ecaa825a357c3fbefa044947719 /vcl | |
| parent | 67b14461bfcf4847b83b17535dde9b3efa2ed762 (diff) | |
always support packagekit if dbus is enabled
Change-Id: I8eb169d33fcb0217989b180aa0c4c0110875be32
Reviewed-on: https://gerrit.libreoffice.org/22503
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index d3658005a385..1ffe504f6700 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -317,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager static bool addFontconfigDir(const OString& rDirectory); std::set<OString> m_aPreviousLangSupportRequests; -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS std::vector<OString> m_aCurrentRequests; #endif Timer m_aFontInstallerTimer; -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void ); #endif PrintFontManager(); diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 8def3626be10..aff28486b148 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -37,7 +37,7 @@ using namespace psp; #include <ft2build.h> #include <fontconfig/fcfreetype.h> -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS #include <dbus/dbus-glib.h> #endif @@ -877,7 +877,7 @@ namespace return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS guint get_xid_for_dbus() { const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow(); @@ -887,7 +887,7 @@ namespace #endif } -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { guint xid = get_xid_for_dbus(); @@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi } } OUString sStillMissing(pRemainingCodes.get(), nRemainingLen); -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS if (get_xid_for_dbus()) { if (sStillMissing == rMissingCodes) //replaced nothing diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index b2525ac232a3..8089eaed1f53 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager() } } -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport)); m_aFontInstallerTimer.SetTimeout(5000); #endif |