Kaydet (Commit) 45dd570a authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) pranavk

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/34926Reviewed-by: 's avatarpranavk <pranavk@collabora.co.uk>
Tested-by: 's avatarpranavk <pranavk@collabora.co.uk>
üst a3f768eb
......@@ -1525,10 +1525,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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment