From 9ab7f5964dcc31a20e4ca4c3bc7279d193252590 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 6 Mar 2017 13:13:52 +0100 Subject: libreofficekit: GTK 3.22 deprecates gtk_show_uri Avoid -Werror=deprecated-declaration and use gtk_show_uri_on_window instead, which needs a GtkWindow. Change-Id: Ia77978348809c8d88cb2823a1549cbdeffcc6c97 Reviewed-on: https://gerrit.libreoffice.org/34926 Reviewed-by: pranavk Tested-by: pranavk (cherry picked from commit 45dd570ac474c336cceac1ca2792f243ee125fa2) Reviewed-on: https://gerrit.libreoffice.org/38158 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit 735f1becd2500d2572f47dfcea319c156d9b5484) --- libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libreofficekit') diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 1881edf7d98a..ab105ad974b0 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -1557,10 +1557,17 @@ static void signalPart(LOKDocView* pLOKDocView, int nPart, gpointer /*pData*/) } /// User clicked on a command button -> inform LOKDocView. -static void signalHyperlink(LOKDocView* /*pLOKDocView*/, char* pPayload, gpointer /*pData*/) +static void signalHyperlink(LOKDocView* pLOKDocView, char* pPayload, gpointer /*pData*/) { GError* pError = nullptr; +#if GTK_CHECK_VERSION(3,22,0) + gtk_show_uri_on_window( + GTK_WINDOW (gtk_widget_get_toplevel(GTK_WIDGET(pLOKDocView))), + pPayload, GDK_CURRENT_TIME, &pError); +#else + (void) pLOKDocView; gtk_show_uri(nullptr, pPayload, GDK_CURRENT_TIME, &pError); +#endif if (pError != nullptr) { g_warning("Unable to show URI %s : %s", pPayload, pError->message); -- cgit