diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-06 13:13:52 +0100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2017-05-30 23:51:48 +0200 |
| commit | 735f1becd2500d2572f47dfcea319c156d9b5484 (patch) | |
| tree | 8abe8a16606104cac2e91970e0b359b36d3c03b7 | |
| parent | 78f84a9a92f8dcd50747480d931f60c58b2344ec (diff) | |
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 <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
(cherry picked from commit 45dd570ac474c336cceac1ca2792f243ee125fa2)
Reviewed-on: https://gerrit.libreoffice.org/38158
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 27c8e43872dd..4bdf3e968c82 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -1216,10 +1216,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); |