From f6d2e629077c5986e6627318202568a6485afec8 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Sun, 1 Oct 2017 13:27:10 +1030 Subject: [PATCH 03/11] glib demo: fix deprecated warnings --- glib/demo/utils.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/glib/demo/utils.c b/glib/demo/utils.c index 8194ff2b..ad9405aa 100644 --- a/glib/demo/utils.c +++ b/glib/demo/utils.c @@ -274,8 +274,13 @@ pgd_action_view_play_rendition (GtkWidget *button, uri = g_file_get_uri (file); g_object_unref (file); if (uri) { +#if GTK_CHECK_VERSION(3, 22, 0) + gtk_show_uri_on_window (GTK_WINDOW(gtk_widget_get_window (button)), + uri, GDK_CURRENT_TIME, NULL); +#else gtk_show_uri (gtk_widget_get_screen (button), uri, GDK_CURRENT_TIME, NULL); +#endif g_free (uri); } } @@ -537,9 +542,14 @@ pgd_movie_view_play_movie (GtkWidget *button, uri = g_file_get_uri (file); g_object_unref (file); if (uri) { - gtk_show_uri (gtk_widget_get_screen (button), - uri, GDK_CURRENT_TIME, NULL); - g_free (uri); +#if GTK_CHECK_VERSION(3, 22, 0) + gtk_show_uri_on_window (GTK_WINDOW(gtk_widget_get_window (button)), + uri, GDK_CURRENT_TIME, NULL); +#else + gtk_show_uri (gtk_widget_get_screen (button), + uri, GDK_CURRENT_TIME, NULL); +#endif + g_free (uri); } } -- 2.11.0