summaryrefslogtreecommitdiff
path: root/vcl/generic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-04 17:28:40 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-05 10:21:54 +0200
commit8cafd08278c0b925aac91ea94d8f907d98f07047 (patch)
tree1c2b0e57c895511fdc67f8063647cc520ef5eaeb /vcl/generic
parent3363f828d63775a11073276dce927b9538b57be6 (diff)
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 0804791d1650..fe978cdc24ad 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -885,13 +885,13 @@ namespace
#endif
}
-IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
+IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
{
#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
guint xid = get_xid_for_dbus();
if (!xid)
- return -1;
+ return;
GError *error = NULL;
/* get the DBUS session connection */
@@ -900,7 +900,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
{
g_debug ("DBUS cannot connect : %s", error->message);
g_error_free (error);
- return -1;
+ return;
}
/* get the proxy with gnome-session-manager */
@@ -911,7 +911,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
if (proxy == NULL)
{
g_debug("Could not get DBUS proxy: org.freedesktop.PackageKit");
- return -1;
+ return;
}
gchar **fonts = static_cast<gchar**>(g_malloc((m_aCurrentRequests.size() + 1) * sizeof(gchar*)));
@@ -940,7 +940,6 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
g_object_unref(G_OBJECT (proxy));
m_aCurrentRequests.clear();
#endif
- return 0;
}
bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes )