summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2012-09-11 02:30:09 +0200
committerRene Engelhard <rene@debian.org>2012-09-11 13:42:59 +0200
commitbea6149df2a611a6958ab1d9fa989dd30d525cd7 (patch)
treec12d0a039444d627ff32baee7d4d0d042b1d8397 /vcl/generic
parentb6640bdef03e89b720974d72ca42fb88937a70c8 (diff)
default to off for packagekit usage; add --enable-packagekit
Change-Id: Ib644cc3768ced8a1959fb9ea9f7f24e29fce87ad
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index b164adc77178..7b779e4940d7 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -82,7 +82,7 @@ using namespace psp;
#define FC_FONTFORMAT "fontformat"
#endif
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
#include <dbus/dbus-glib.h>
#endif
@@ -834,7 +834,7 @@ namespace
return OString();
}
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
LanguageTag getExemplerLangTagForCodePoint(sal_uInt32 currentChar)
{
int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT);
@@ -857,7 +857,7 @@ namespace
IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
{
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
guint xid = get_xid_for_dbus();
if (!xid)
@@ -1056,7 +1056,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
}
}
OUString sStillMissing(pRemainingCodes, nRemainingLen);
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
if (get_xid_for_dbus())
{
if (sStillMissing == rMissingCodes) //replaced nothing