diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-09 12:07:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-11 14:29:22 +0100 |
| commit | b71660540e326db3b15899a9db0aa3bf4aed2cee (patch) | |
| tree | 384de799a0e4a17efb06286d40ace7618d237fb9 /vcl/unx/generic | |
| parent | 74b3924a98dfeeec719f7bc27a2e0a2e1a597167 (diff) | |
[API CHANGE] migrate PackageKit usage to Modify2
xid dropped in favour of application_id
Change-Id: Id1eb43aa9c8dfb4eac82f99eff0f84c5320e0da0
Reviewed-on: https://gerrit.libreoffice.org/47661
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/unx/generic')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 94c80cc6cf8f..59acfa5841b0 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -859,15 +859,6 @@ namespace aBuf.append('-').append(pScriptCode); return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8); } - - sal_uInt32 get_xid_for_dbus() - { - const vcl::Window *pTopWindow = Application::GetActiveTopWindow(); - if (!pTopWindow) - pTopWindow = Application::GetFirstTopLevelWindow(); - const SystemEnvData* pEnvData = pTopWindow ? pTopWindow->GetSystemData() : nullptr; - return pEnvData ? GetDbusId(*pEnvData) : 0; - } } IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) @@ -876,7 +867,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { using namespace org::freedesktop::PackageKit; css::uno::Reference<XSyncDbusSessionHelper> xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); - xSyncDbusSessionHelper->InstallFontconfigResources(get_xid_for_dbus(), comphelper::containerToSequence(m_aCurrentRequests), "hide-finished"); + xSyncDbusSessionHelper->InstallFontconfigResources(comphelper::containerToSequence(m_aCurrentRequests), "hide-finished"); } catch (const css::uno::Exception& e) { |